@travetto/pack 3.0.0-rc.8 → 3.0.0-rc.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.0.0-rc.8",
+  "version": "3.0.0-rc.9",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -27,12 +27,12 @@
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-terser": "^0.4.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
-    "@travetto/base": "^3.0.0-rc.8",
+    "@travetto/base": "^3.0.0-rc.9",
     "rollup": "^3.12.1",
     "rollup-plugin-sourcemaps": "^0.6.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.0.0-rc.9"
+    "@travetto/cli": "^3.0.0-rc.10"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/docker-operation.ts

@@ -1,11 +1,11 @@
 import fs from 'fs/promises';
 
-import { path } from '@travetto/manifest';
+import { path, RootIndex } from '@travetto/manifest';
 import { ExecUtil } from '@travetto/base';
 import { cliTpl } from '@travetto/cli';
 
 import { ActiveShellCommand } from './shell';
-import { DockerPackConfig } from './types';
+import { DockerPackConfig, DockerPackFactoryModule } from './types';
 
 export class DockerPackOperation {
 
@@ -19,13 +19,9 @@ export class DockerPackOperation {
   static async* writeDockerFile(cfg: DockerPackConfig): AsyncIterable<string[]> {
     const dockerFile = path.resolve(cfg.workspace, 'Dockerfile');
     const title = cliTpl`${{ title: 'Generating Docker File' }} ${{ path: dockerFile }}`;
-    const content = `
-FROM ${cfg.dockerImage}
-WORKDIR /app
-COPY . .
-${(cfg.dockerPort ?? []).map(x => `EXPOSE ${x}`).join('\n')}
-ENTRYPOINT ["/app/${cfg.entryCommand}.sh"]
-`;
+    const mod: DockerPackFactoryModule = await import(RootIndex.getFromImport(cfg.dockerFactory)!.import);
+    const content = (await mod.factory(cfg)).trim();
+
     if (cfg.ejectFile) {
       yield ActiveShellCommand.comment(title);
       yield* ActiveShellCommand.createFile(dockerFile, content.split(/\n/));

package/support/bin/operation.ts

@@ -122,7 +122,7 @@ export class PackOperation {
   static async * writeEntryScript(cfg: CommonPackConfig): AsyncIterable<string[]> {
     const title = 'Writing entry scripts';
 
-    const files = ([['posix', 'sh'], ['win32', 'bat']] as const)
+    const files = ([['posix', 'sh'], ['win32', 'cmd']] as const)
       .map(([type, ext]) => ({
         fileTitle: cliTpl`${{ title }} ${{ path: `${cfg.entryCommand}.${ext}` }} args=(${{ param: cfg.entryArguments.join(' ') }})`,
         file: `${cfg.entryCommand}.${ext}`,

package/support/bin/rollup.ts

@@ -10,6 +10,8 @@ import { RootIndex } from '@travetto/manifest';
 import { getEntry, getOutput, getTerserConfig, getFiles } from './config';
 import { travettoImportPlugin } from './rollup-esm-dynamic-import';
 
+const NEVER_INCLUDE = new Set(['node-forge', '@parcel/watcher']);
+
 export default function buildConfig(): RollupOptions {
   const output = getOutput();
   const entry = getEntry();
@@ -18,10 +20,10 @@ export default function buildConfig(): RollupOptions {
   return {
     input: [entry],
     output,
-    external: ['node-forge', '@parcel/watcher'],
     plugins: [
       jsonImport(),
       commonjsRequire({
+        ignore: id => NEVER_INCLUDE.has(id),
         dynamicRequireRoot: RootIndex.manifest.workspacePath,
         dynamicRequireTargets: (output.format === 'commonjs' ? files : [])
       }),

package/support/bin/types.ts

@@ -31,6 +31,7 @@ export type CommonPackOptions = {
 };
 
 export type DockerPackConfig = {
+  dockerFactory: string;
   dockerImage: string;
   dockerName: string;
   dockerTag: string[];
@@ -40,6 +41,7 @@ export type DockerPackConfig = {
 } & CommonPackConfig;
 
 export type DockerPackOptions = {
+  dockerFactory: OptionConfig<string>;
   dockerImage: OptionConfig<string>;
   dockerName: OptionConfig<string>;
   dockerTag: ListOptionConfig<string>;
@@ -62,4 +64,7 @@ export type ShellCommandImpl = {
   chdir(dest: string): string[];
   comment(message: string): string[];
   zip(output: string): string[];
-};
+};
+
+export type DockerPackFactory = (cfg: DockerPackConfig) => (string | Promise<string>);
+export type DockerPackFactoryModule = { factory: DockerPackFactory };

package/support/cli.pack_docker.ts

@@ -14,6 +14,7 @@ export class PackDockerCommand extends BasePackCommand<DockerPackOptions, Docker
     const opts = this.getCommonOptions();
     return {
       ...opts,
+      dockerFactory: this.option({ short: 'df', desc: 'Docker Factory source', def: '@travetto/pack/support/pack.dockerfile' }),
       dockerImage: this.option({ short: 'di', desc: 'Docker Image to extend', def: 'node:18-alpine3.16' }),
       dockerName: this.option({ short: 'dn', desc: 'Docker Image Name', def: this.monoRoot ? '<module>' : this.getSimpleModuleName() }),
       dockerTag: this.listOption({ short: 'dt', desc: 'Docker Image Tag', def: ['latest'] }),

package/support/pack.base.ts

@@ -96,13 +96,15 @@ export abstract class BasePackCommand<T extends CommonPackOptions, S extends Com
     module = this.getModule(module);
 
     const cfg = await this.buildConfig();
-    cfg.entryArguments = args;
+    cfg.entryArguments = Array.isArray(args) ? args : [];
 
     for (const k in this.cmd) {
-      const v = this.cmd[k];
-      if (typeof v === 'string' && /<module>/.test(v)) {
-        // @ts-expect-error
-        this.cmd[k] = v.replace(/<module>/g, this.getSimpleModuleName());
+      if (Object.hasOwn(this.cmd, k)) {
+        const v = this.cmd[k];
+        if (typeof v === 'string' && /<module>/.test(v)) {
+          // @ts-expect-error
+          this.cmd[k] = v.replace(/<module>/g, this.getSimpleModuleName());
+        }
       }
     }
 

package/support/pack.dockerfile.ts

@@ -0,0 +1,9 @@
+import { DockerPackFactory } from './bin/types';
+
+export const factory: DockerPackFactory = cfg => `
+FROM ${cfg.dockerImage}
+WORKDIR /app
+COPY . .
+${cfg.dockerPort.map(port => `EXPOSE ${port}`).join('\n')}
+ENTRYPOINT ["/app/${cfg.entryCommand}.sh"]
+`;