@travetto/pack 3.4.0-rc.9 → 3.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.4.0-rc.9",
+  "version": "3.4.1",
   "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/docker-operation.ts

@@ -55,7 +55,7 @@ export class DockerPackOperation {
    * Building Docker Container
    */
   static async* buildDockerContainer(cfg: DockerPackConfig): AsyncIterable<string[]> {
-    const cmd = ['docker', 'build', ...DockerPackOperation.getDockerTags(cfg).flatMap(x => ['-t', x]), '.'];
+    const cmd = ['docker', 'build', cfg.dockerBuildFlags, ...DockerPackOperation.getDockerTags(cfg).flatMap(x => ['-t', x]), '.'].filter((x): x is string => !!x);
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Building Docker Container' }} ${{ param: cfg.dockerTag?.join(',') }}`);
 

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/types.ts

@@ -19,6 +19,7 @@ export type CommonPackConfig = {
 
 export type DockerPackConfig = {
   dockerFactory: string;
+  dockerBuildFlags?: string;
   dockerImage: string;
   dockerName: string;
   dockerTag?: string[];

package/support/bin/util.ts

@@ -1,7 +1,7 @@
 import fs from 'fs/promises';
 
 import { path, RootIndex } from '@travetto/manifest';
-import { AppError, ExecUtil, ExecutionOptions, ExecutionResult } from '@travetto/base';
+import { AppError, ExecUtil, ExecutionOptions } from '@travetto/base';
 
 import { ActiveShellCommand } from './shell';
 

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';
@@ -27,6 +27,8 @@ export class PackDockerCommand extends BasePackCommand {
   dockerPort: number[] = [];
   @CliFlag({ desc: 'Docker Push Tags ', short: 'dx', envVars: ['PACK_DOCKER_PUSH'] })
   dockerPush = false;
+  @CliFlag({ desc: 'Docker Build Flags ', short: 'dr', envVars: ['PACK_DOCKER_BUILD_FLAGS'] })
+  dockerBuildFlags?: string;
   @CliFlag({ desc: 'Docker Registry ', short: 'dr', envVars: ['PACK_DOCKER_REGISTRY'] })
   dockerRegistry?: string;
   @CliFlag({ desc: 'Docker Runtime user ', short: 'du', name: 'docker-runtime-user', envVars: ['PACK_DOCKER_RUNTIME_USER'] })

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 {