@travetto/pack 3.4.0-rc.8 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.4.0-rc.8",
+  "version": "3.4.0",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -28,11 +28,11 @@
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/base": "^3.4.0-rc.2",
+    "@travetto/base": "^3.4.0",
     "rollup": "^4.3.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.0-rc.3"
+    "@travetto/cli": "^3.4.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/config.ts

@@ -67,14 +67,10 @@ export function getFiles(): string[] {
 }
 
 export function getIgnoredModules(): string[] {
-  const out = [...RootIndex.getModuleList('all')]
+  return [...RootIndex.getModuleList('all')]
     .map(x => RootIndex.manifest.modules[x])
     .filter(m => !m.prod)
     .map(m => m.name);
-
-  out.push('@travetto/pack', '@travetto/compiler');
-
-  return out;
 }
 
 export function getTerserConfig(): Parameters<typeof terser>[0] {

package/support/bin/docker-operation.ts

@@ -65,6 +65,8 @@ export class DockerPackOperation {
       yield ActiveShellCommand.chdir(path.cwd());
     } else {
       await PackUtil.runCommand(cmd, { cwd: cfg.workspace, 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

@@ -88,6 +88,8 @@ 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`));
+      yield [cliTpl`${{ title: 'Bundled Output ' }} ${{ identifier: 'sizeKb' }}=${{ param: Math.trunc(stat.size / 2 ** 10) }}`];
     }
   }
 

package/support/bin/rollup-esm-dynamic-import.ts

@@ -1,6 +1,6 @@
-import { AcornNode, Plugin } from 'rollup';
+import { AstNode, Plugin } from 'rollup';
 import { walk } from 'estree-walker';
-import MagicString from 'magic-string';
+import magicString from 'magic-string';
 
 const BRAND = '__imp';
 
@@ -23,20 +23,20 @@ export function travettoImportPlugin(entry: string, files: string[]): Plugin {
     transform(code, id) {
       const parsed = this.parse(code);
 
-      let ms: MagicString | undefined;
+      let ms: magicString | undefined;
 
       if (id.includes(entry)) {
-        (ms ??= new MagicString(code).append(DYNAMIC_IMPORT(imports)));
+        (ms ??= new magicString(code).append(DYNAMIC_IMPORT(imports)));
       }
 
       walk(parsed, {
         enter: (node) => {
           // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          const impNode = node as AcornNode & { source?: { type: string } };
+          const impNode = node as AstNode & { source?: { type: string } };
           if (impNode.type !== 'ImportExpression' || impNode.source?.type === 'Literal') {
             return;
           }
-          (ms ??= new MagicString(code)).overwrite(impNode.start, impNode.start + 6, BRAND);
+          (ms ??= new magicString(code)).overwrite(impNode.start, impNode.start + 6, BRAND);
         }
       });
 

package/support/bin/util.ts

@@ -66,8 +66,8 @@ export class PackUtil {
   /**
    * Track result response
    */
-  static async runCommand(cmd: string[], opts: ExecutionOptions = {}): Promise<void> {
-    const { valid, code, stderr, message } = await ExecUtil.spawn(cmd[0], cmd.slice(1), {
+  static async runCommand(cmd: string[], opts: ExecutionOptions = {}): Promise<string> {
+    const { valid, code, stderr, message, stdout } = await ExecUtil.spawn(cmd[0], cmd.slice(1), {
       stdio: [0, 'pipe', 'pipe', 'ipc'],
       ...opts,
       catchAsResult: true
@@ -76,5 +76,6 @@ export class PackUtil {
       process.exitCode = code;
       throw new AppError(stderr || message || 'An unexpected error has occurred');
     }
+    return stdout;
   }
 }

package/support/cli.pack.ts

@@ -5,5 +5,5 @@ import { BasePackCommand } from './pack.base';
 /**
  * Standard pack support
  */
-@CliCommand({ fields: ['module'] })
+@CliCommand({ addModule: true })
 export class PackCommand extends BasePackCommand { }

package/support/cli.pack_docker.ts

@@ -13,7 +13,7 @@ const DEFAULT_USER = 'app';
 /**
  * Standard docker support for pack
  */
-@CliCommand({ fields: ['module'] })
+@CliCommand({ addModule: true })
 export class PackDockerCommand extends BasePackCommand {
   @CliFlag({ desc: 'Docker Factory source ', short: 'df', envVars: ['PACK_DOCKER_FACTORY'] })
   dockerFactory = '@travetto/pack/support/pack.dockerfile';

package/support/cli.pack_zip.ts

@@ -6,7 +6,7 @@ import { BasePackCommand, PackOperationShape } from './pack.base';
 /**
  * Standard zip support for pack
  */
-@CliCommand({ fields: ['module'] })
+@CliCommand({ addModule: true })
 export class PackZipCommand extends BasePackCommand {
 
   initialize(): void {