@travetto/pack 4.1.0 → 4.1.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -25,16 +25,16 @@
     "directory": "module/pack"
   },
   "dependencies": {
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/base": "^4.1.0",
-    "@travetto/terminal": "^4.1.0",
-    "rollup": "^4.17.2"
+    "@travetto/base": "^4.1.1",
+    "@travetto/terminal": "^4.1.1",
+    "rollup": "^4.18.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.1.0"
+    "@travetto/cli": "^4.1.1"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/types.ts

@@ -11,6 +11,7 @@ export type CommonPackConfig = {
   mainScripts?: boolean;
   module: string;
   envFile: string;
+  env?: string;
   manifestFile: string;
 
   // Bundle
@@ -20,6 +21,7 @@ export type CommonPackConfig = {
   minify: boolean;
   sourcemap: boolean;
   includeSources: boolean;
+  includeWorkspaceResources?: boolean;
 };
 
 
@@ -51,7 +53,7 @@ export type ShellCommandImpl = {
   chdirScript(): string[];
   callCommandWithAllArgs(cmd: string, ...args: string[]): string[];
   copy(src: string, dest: string): string[];
-  copyRecursive(src: string, dest: string): string[];
+  copyRecursive(src: string, dest: string, inclusive?: boolean): string[];
   rmRecursive(dest: string): string[];
   mkdir(dest: string): string[];
   export(key: string, value: string): string[];

package/support/bin/operation.ts

@@ -177,6 +177,27 @@ export class PackOperation {
     }
   }
 
+  /**
+   * Copy over repo /resources folder into workspace, will get packaged into final output
+   */
+  static async * copyMonoRepoResources(cfg: CommonPackConfig): AsyncIterable<string[]> {
+    if (!cfg.includeWorkspaceResources) {
+      return;
+    }
+
+    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Copying over workspace resources' }}`);
+
+    const dest = path.resolve(cfg.workspace, 'workspace-resources');
+    const src = RuntimeContext.workspaceRelative('resources');
+
+    if (cfg.ejectFile) {
+      yield ActiveShellCommand.copyRecursive(src, dest, true);
+    } else {
+      await fs.mkdir(dest, { recursive: true });
+      await PackUtil.copyRecursive(src, dest, true);
+    }
+  }
+
   /**
    * Copy over /resources folder into workspace, will get packaged into final output
    */
@@ -187,7 +208,7 @@ export class PackOperation {
       dest: path.resolve(cfg.workspace, 'resources')
     };
 
-    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Copying over resources' }}`);
+    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Copying over module resources' }}`);
 
     if (cfg.ejectFile) {
       if (resources.count) {

package/support/bin/shell.ts

@@ -1,5 +1,6 @@
+import util from 'node:util';
+
 import { path } from '@travetto/manifest';
-import { StyleUtil } from '@travetto/terminal';
 
 import { ShellCommandImpl } from '../../src/types';
 
@@ -25,13 +26,14 @@ export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
       )
     ],
     copy: (src, dest) => ['copy', src, dest],
-    copyRecursive: (src, dest) => ['xcopy', '/y', '/h', '/s', path.toNative(src), path.toNative(dest)],
+    copyRecursive: (src, dest, inclusive) =>
+      ['xcopy', '/y', '/h', '/s', inclusive ? `${path.toNative(src)}\\*.*` : path.toNative(src), path.toNative(dest)],
     rmRecursive: (dest) => ['rmdir', '/Q', '/S', dest],
     mkdir: (dest) => ['md', dest],
     export: (key, value) => ['set', `${key}=${value}`],
     chdir: (dest) => ['cd', dest],
-    comment: (message) => ['\nREM', StyleUtil.cleanText(message), '\n'],
-    echo: (message) => ['echo', `"${escape(StyleUtil.cleanText(message))}"\n`],
+    comment: (message) => ['\nREM', util.stripVTControlCharacters(message), '\n'],
+    echo: (message) => ['echo', `"${escape(util.stripVTControlCharacters(message))}"\n`],
     zip: (outputFile) => ['powershell', 'Compress-Archive', '-Path', '.', '-DestinationPath', outputFile]
   },
   posix: {
@@ -45,13 +47,14 @@ export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
       ...(mode ? [['chmod', mode, file]] : [])
     ],
     copy: (src, dest) => ['cp', src, dest],
-    copyRecursive: (src, dest) => ['cp', '-r', '-p', src, dest],
+    copyRecursive: (src, dest, inclusive) =>
+      ['cp', '-r', '-p', inclusive ? `${src}/*` : src, dest],
     rmRecursive: (dest) => ['rm', '-rf', dest],
     mkdir: (dest) => ['mkdir', '-p', dest],
     export: (key, value) => ['export', `${key}=${value}`],
     chdir: (dest) => ['cd', dest],
-    comment: (message) => ['\n#', StyleUtil.cleanText(message), '\n'],
-    echo: (message) => ['echo', `"${escape(StyleUtil.cleanText(message))}"\n`],
+    comment: (message) => ['\n#', util.stripVTControlCharacters(message), '\n'],
+    echo: (message) => ['echo', `"${escape(util.stripVTControlCharacters(message))}"\n`],
     zip: (outputFile) => ['zip', '-r', outputFile, '.']
   },
 };

package/support/bin/util.ts

@@ -22,9 +22,9 @@ export class PackUtil {
    * @param dest The folder to copy to
    * @param ignore Should errors be ignored
    */
-  static async copyRecursive(src: string, dest: string, ignore = false): Promise<void> {
-    const [cmd, ...args] = ActiveShellCommand.copyRecursive(src, dest);
-    const res = await ExecUtil.getResult(spawn(cmd, args, { shell: false }), { catch: true });
+  static async copyRecursive(src: string, dest: string, inclusive: boolean = false, ignore = false): Promise<void> {
+    const [cmd, ...args] = ActiveShellCommand.copyRecursive(src, dest, inclusive);
+    const res = await ExecUtil.getResult(spawn(cmd, args, { shell: true }), { catch: true });
     if (res.code && !ignore) {
       throw new Error(`Failed to copy ${src} to ${dest}`);
     }
@@ -48,8 +48,8 @@ export class PackUtil {
 
     if (!(file === '-' || file === '/dev/stdout')) {
       await fs.mkdir(path.dirname(file), { recursive: true });
-      await fs.truncate(file);
-      stream = await fs.open(file, 'utf8');
+      await fs.writeFile(file, '', 'utf8');
+      stream = await fs.open(file, 'w', 0o755);
     }
 
     const write = (text: string): Promise<unknown> | unknown => stream ? stream.write(`${text}\n`) : process.stdout.write(`${text}\n`);

package/support/pack.base.ts

@@ -68,6 +68,9 @@ export abstract class BasePackCommand implements CliCommandShape {
   @CliFlag({ desc: 'Manifest File Name' })
   manifestFile = 'manifest.json';
 
+  @CliFlag({ desc: 'Include workspace resources', short: 'wr' })
+  includeWorkspaceResources: boolean = false;
+
   @Ignore()
   module: string;
 
@@ -84,6 +87,7 @@ export abstract class BasePackCommand implements CliCommandShape {
       PackOperation.writeEnv,
       PackOperation.writePackageJson,
       PackOperation.writeEntryScript,
+      PackOperation.copyMonoRepoResources,
       PackOperation.copyResources,
       PackOperation.writeManifest,
       PackOperation.bundle,