@travetto/pack 7.0.2 → 7.0.4

package/README.md

@@ -173,7 +173,7 @@ $ trv pack:docker -x /dev/stdout web:http
 export DIST=/tmp/<temp-folder>
 export TRV_OUT=<workspace-root>/.trv/output
 export ROOT=<workspace-root>/related/todo-app
-export MOD=@travetto/todo-app
+export MODULE=@travetto/todo-app
 
 # Cleaning Output $DIST 
 
@@ -188,7 +188,7 @@ echo "Writing $DIST/.env"
 
 echo "NODE_ENV=production" > $DIST/.env
 echo "TRV_MANIFEST=manifest.json" >> $DIST/.env
-echo "TRV_MODULE=$MOD" >> $DIST/.env
+echo "TRV_MODULE=$MODULE" >> $DIST/.env
 echo "TRV_CLI_IPC=" >> $DIST/.env
 echo "TRV_RESOURCE_OVERRIDES=@#resources=@@#resources" >> $DIST/.env
 
@@ -225,7 +225,7 @@ cp -r -p $ROOT/resources/* $DIST/resources
 
 echo "Writing Manifest manifest.json"
 
-TRV_MODULE=$MOD npx trvc manifest --prod $DIST/manifest.json
+TRV_MODULE=$MODULE npx trvc manifest:production $DIST/manifest.json
 
 # Bundling Output minify=true sourcemap=false entryPoint=@travetto/cli/support/entry.trv.ts 
 
@@ -238,7 +238,7 @@ export BUNDLE_SOURCEMAP=false
 export BUNDLE_SOURCES=false
 export BUNDLE_OUTPUT=$DIST
 export BUNDLE_ENV_FILE=.env
-export TRV_MANIFEST=$TRV_OUT/node_modules/$MOD
+export TRV_MANIFEST=$TRV_OUT/node_modules/$MODULE
 cd $TRV_OUT
 npx rollup -c $TRV_OUT/node_modules/@travetto/pack/support/rollup/build.js
 cd $ROOT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "7.0.2",
+  "version": "7.0.4",
   "type": "module",
   "description": "Code packing utilities",
   "keywords": [
@@ -30,12 +30,12 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/runtime": "^7.0.2",
-    "@travetto/terminal": "^7.0.2",
-    "rollup": "^4.54.0"
+    "@travetto/runtime": "^7.0.4",
+    "@travetto/terminal": "^7.0.4",
+    "rollup": "^4.55.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.2"
+    "@travetto/cli": "^7.0.6"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config-util.ts

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

package/support/bin/docker-operation.ts

@@ -5,7 +5,7 @@ import { JSONUtil, Runtime } from '@travetto/runtime';
 import { cliTpl } from '@travetto/cli';
 
 import { ActiveShellCommand } from './shell.ts';
-import { DockerPackConfig, DockerPackFactoryModule } from '../../src/types.ts';
+import type { DockerPackConfig, DockerPackFactoryModule } from '../../src/types.ts';
 import { PackOperation } from './operation.ts';
 import { PackUtil } from './util.ts';
 
@@ -37,8 +37,8 @@ export class DockerPackOperation {
    */
   static async* writeDockerFile(config: DockerPackConfig): AsyncIterable<string[]> {
     const dockerFile = path.resolve(config.buildDirectory, 'Dockerfile');
-    const mod = await Runtime.importFrom<DockerPackFactoryModule>(config.dockerFactory);
-    const content = (await mod.factory(config)).trim();
+    const { factory } = await Runtime.importFrom<DockerPackFactoryModule>(config.dockerFactory);
+    const content = (await factory(config)).trim();
 
     yield* PackOperation.title(config, cliTpl`${{ title: 'Generating Docker File' }} ${{ path: dockerFile }} ${{ param: config.dockerFactory }}`);
 

package/support/bin/operation.ts

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { cliTpl } from '@travetto/cli';
 import { Env, Runtime, RuntimeIndex } from '@travetto/runtime';
 
-import { CommonPackConfig } from '../../src/types.ts';
+import type { CommonPackConfig } from '../../src/types.ts';
 import { PackUtil } from './util.ts';
 import { ActiveShellCommand, ShellCommands } from './shell.ts';
 
@@ -67,7 +67,7 @@ export class PackOperation {
         ['BUNDLE_SOURCES', config.includeSources],
         ['BUNDLE_OUTPUT', config.buildDirectory],
         ['BUNDLE_ENV_FILE', config.envFile],
-        ['BUNDLE_EXTERNAL', config.externalDependencies.map(mod => mod.split(':')[0]).join(',')]
+        ['BUNDLE_EXTERNAL', config.externalDependencies.map(module => module.split(':')[0]).join(',')]
       ] as const)
         .filter(pair => pair[1] === false || pair[1])
         .map(pair => [pair[0], `${pair[1]}`])
@@ -225,7 +225,7 @@ export class PackOperation {
    */
   static async * writeManifest(config: CommonPackConfig): AsyncIterable<string[]> {
     const out = path.resolve(config.buildDirectory, config.manifestFile);
-    const cmd = ['npx', 'trvc', 'manifest', '--prod', out];
+    const cmd = ['npx', 'trvc', 'manifest:production', out];
     const env = { ...Env.TRV_MODULE.export(config.module) };
 
     yield* PackOperation.title(config, cliTpl`${{ title: 'Writing Manifest' }} ${{ path: config.manifestFile }}`);

package/support/bin/shell.ts

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

package/support/bin/util.ts

@@ -1,5 +1,5 @@
 import fs from 'node:fs/promises';
-import { spawn, SpawnOptions } from 'node:child_process';
+import { spawn, type SpawnOptions } from 'node:child_process';
 import path from 'node:path';
 
 import { AppError, ExecUtil, RuntimeIndex } from '@travetto/runtime';
@@ -40,7 +40,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: RuntimeIndex.outputRoot, ROOT: path.resolve(), MOD: module };
+    const vars = { DIST: workspace, TRV_OUT: RuntimeIndex.outputRoot, ROOT: path.resolve(), MODULE: module };
 
     const replaceArgs = (text: string): string => Object.entries(vars)
       .reduce((result, [key, value]) => result.replaceAll(value, ActiveShellCommand.var(key)), text);

package/support/cli.pack_docker.ts

@@ -1,12 +1,12 @@
 import path from 'node:path';
 
 import { RuntimeIndex } from '@travetto/runtime';
-import { CliCommand, CliFlag, CliUtil, CliValidationError } from '@travetto/cli';
+import { CliCommand, CliFlag, CliUtil, type CliValidationError } from '@travetto/cli';
 import { Ignore, Required } from '@travetto/schema';
 
 import { DockerPackOperation } from './bin/docker-operation.ts';
-import { BasePackCommand, PackOperationShape } from './pack.base';
-import { DockerPackConfig } from '../src/types.ts';
+import { BasePackCommand, type PackOperationShape } from './pack.base';
+import type { DockerPackConfig } from '../src/types.ts';
 
 const NODE_MAJOR = process.version.match(/\d+/)?.[0] ?? '22';
 

package/support/cli.pack_zip.ts

@@ -1,7 +1,7 @@
 import { CliCommand, CliUtil } from '@travetto/cli';
 
 import { PackOperation } from './bin/operation.ts';
-import { BasePackCommand, PackOperationShape } from './pack.base';
+import { BasePackCommand, type PackOperationShape } from './pack.base';
 
 /**
  * Standard zip support for pack

package/support/pack.base.ts

@@ -1,7 +1,7 @@
 import os from 'node:os';
 import path from 'node:path';
 
-import { CliCommandShape, CliFlag, ParsedState, cliTpl } from '@travetto/cli';
+import { type CliCommandShape, CliFlag, type ParsedState, cliTpl } from '@travetto/cli';
 import { TimeUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 import { Terminal } from '@travetto/terminal';
 import { Ignore, Method, Required, Schema } from '@travetto/schema';
@@ -17,7 +17,7 @@ export abstract class BasePackCommand implements CliCommandShape {
 
   static get entryPoints(): string[] {
     return RuntimeIndex.find({
-      module: mod => mod.prod,
+      module: module => module.prod,
       folder: folder => folder === 'support',
       file: file => file.sourceFile.includes('entry.')
     })
@@ -129,9 +129,9 @@ export abstract class BasePackCommand implements CliCommandShape {
   getBinaryDependencies(): string[] {
     return [...RuntimeIndex.getModuleList('all')]
       .map(name => RuntimeIndex.getModule(name))
-      .filter(mod => !!mod)
-      .filter(mod => mod.prod)
-      .map(mod => PackageUtil.readPackage(mod?.sourcePath))
+      .filter(module => !!module)
+      .filter(module => module.prod)
+      .map(module => PackageUtil.readPackage(module?.sourcePath))
       .map(pkg => pkg?.travetto?.build?.binaryDependencies ?? [])
       .flat();
   }

package/support/pack.dockerfile.ts

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

package/support/rollup/config.ts

@@ -6,19 +6,19 @@ import type terser from '@rollup/plugin-terser';
 import { type ManifestModule, ManifestModuleUtil } from '@travetto/manifest';
 import { EnvProp, Runtime, RuntimeIndex } from '@travetto/runtime';
 
-import { CoreRollupConfig } from '../../src/types.ts';
+import type { CoreRollupConfig } from '../../src/types.ts';
 
-function getFilesFromModule(mod: ManifestModule): string[] {
+function getFilesFromModule(module: ManifestModule): string[] {
   return [
-    ...mod.files.$index ?? [],
-    ...mod.files.src ?? [],
-    ...(mod.files.bin ?? []).filter(file => !(/bin\/trv[.]js$/.test(file[0]) && mod.name === '@travetto/cli')),
-    ...(mod.files.support ?? [])
+    ...module.files.$index ?? [],
+    ...module.files.src ?? [],
+    ...(module.files.bin ?? []).filter(file => !(/bin\/trv[.]js$/.test(file[0]) && module.name === '@travetto/cli')),
+    ...(module.files.support ?? [])
       .filter(file => !/support\/(test|doc|pack)/.test(file[0]))
   ]
     .filter(([, type]) => type === 'ts' || type === 'js' || type === 'json')
     .filter(([, , , role]) => (role ?? 'std') === 'std') // Only include standard files
-    .map(([file]) => ManifestModuleUtil.withOutputExtension(path.resolve(mod.outputFolder, file)));
+    .map(([file]) => ManifestModuleUtil.withOutputExtension(path.resolve(module.outputFolder, file)));
 }
 
 export function getOutput(): OutputOptions {
@@ -43,7 +43,7 @@ export function getEntry(): string {
 export function getFiles(entry?: string): string[] {
   return [...RuntimeIndex.getModuleList('all')]
     .map(name => RuntimeIndex.getManifestModule(name))
-    .filter(mod => mod.prod)
+    .filter(module => module.prod)
     .flatMap(getFilesFromModule)
     .filter(file => (!entry || !file.endsWith(entry)) && !file.includes('@travetto/pack/support/'));
 }
@@ -51,7 +51,7 @@ export function getFiles(entry?: string): string[] {
 export function getIgnoredModules(): ManifestModule[] {
   return [...RuntimeIndex.getModuleList('all')]
     .map(name => RuntimeIndex.getManifestModule(name))
-    .filter(mod => !mod.prod);
+    .filter(module => !module.prod);
 }
 
 export function getMinifyConfig(): Parameters<typeof terser>[0] {
@@ -80,6 +80,6 @@ export function getCoreConfig(): CoreRollupConfig {
 
   return {
     output, entry, files, envFile, minify, external,
-    ignore: new Set([...ignoreModules.map(mod => mod.name), ...ignoreFiles]),
+    ignore: new Set([...ignoreModules.map(module => module.name), ...ignoreFiles]),
   };
 }

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

@@ -1,9 +1,9 @@
 import { readFileSync } from 'node:fs';
-import { Plugin } from 'rollup';
+import type { Plugin } from 'rollup';
 
 import { RuntimeIndex } from '@travetto/runtime';
 
-import { CoreRollupConfig } from '../../src/types.ts';
+import type { CoreRollupConfig } from '../../src/types.ts';
 
 export const GLOBAL_IMPORT = '__trv_imp';
 

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

@@ -1,9 +1,9 @@
-import { AstNode, Plugin } from 'rollup';
+import type { AstNode, Plugin } from 'rollup';
 import { walk } from 'estree-walker';
 import magicString from 'magic-string';
 
 import { GLOBAL_IMPORT } from './rollup-travetto-entry.ts';
-import { CoreRollupConfig } from '../../src/types.ts';
+import type { CoreRollupConfig } from '../../src/types.ts';
 
 type TNode = AstNode & { source?: { type: string }, callee?: TNode & { name?: string }, args?: TNode[] };
 

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

@@ -1,11 +1,11 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
 
-import { LoadResult, Plugin, PluginContext, type SourceMapInput } from 'rollup';
+import type { LoadResult, Plugin, PluginContext, SourceMapInput } from 'rollup';
 
 import { FileLoader } from '@travetto/runtime';
 
-import { CoreRollupConfig } from '../../src/types.ts';
+import type { CoreRollupConfig } from '../../src/types.ts';
 
 function toString(error: unknown): string {
   return error instanceof Error ? error.stack ?? error.toString() : JSON.stringify(error);