@travetto/pack 3.4.0-rc.1 → 3.4.0-rc.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.4.0-rc.1",
+  "version": "3.4.0-rc.11",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -27,14 +27,12 @@
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/base": "^3.4.0-rc.0",
-    "rollup": "^4.1.5",
-    "rollup-plugin-sourcemaps": "^0.6.3"
+    "@travetto/base": "^3.4.0-rc.4",
+    "rollup": "^4.3.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.0-rc.0"
+    "@travetto/cli": "^3.4.0-rc.5"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {
@@ -43,7 +41,7 @@
   },
   "travetto": {
     "displayName": "Pack",
-    "profiles": [
+    "roles": [
       "build"
     ]
   },

package/support/bin/config.ts

@@ -24,7 +24,8 @@ function getFilesFromModule(m: ManifestModule): string[] {
   return [
     ...m.files.$index ?? [],
     ...m.files.src ?? [],
-    ...m.files.bin ?? [],
+    ...(m.files.bin ?? [])
+      .filter(f => !(/bin\/trv[.]js$/.test(f[0]) && m.name === '@travetto/cli')),
     ...(m.files.support ?? [])
       .filter(f => !/support\/(test|doc)/.test(f[0]))
   ]
@@ -61,10 +62,17 @@ export function getEntry(): string {
 export function getFiles(): string[] {
   return [...RootIndex.getModuleList('all')]
     .map(x => RootIndex.manifest.modules[x])
-    .filter(m => m.profiles.includes('std'))
+    .filter(m => m.prod)
     .flatMap(getFilesFromModule);
 }
 
+export function getIgnoredModules(): string[] {
+  return [...RootIndex.getModuleList('all')]
+    .map(x => RootIndex.manifest.modules[x])
+    .filter(m => !m.prod)
+    .map(m => m.name);
+}
+
 export function getTerserConfig(): Parameters<typeof terser>[0] {
   return {
     mangle: true,

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/rollup-sourcemaps.ts

@@ -0,0 +1,37 @@
+import path from 'path';
+import fs from 'fs/promises';
+
+import { LoadResult, Plugin, PluginContext } from 'rollup';
+
+function toString(error: unknown): string {
+  return error instanceof Error ? error.stack ?? error.toString() : JSON.stringify(error);
+}
+// Pulled from https://github.com/Azure/azure-sdk-for-js/blob/main/common/tools/dev-tool/src/config/rollup.base.config.ts#L128
+export function sourcemaps(): Plugin {
+  return {
+    name: 'load-source-maps',
+    async load(this: PluginContext, id: string): Promise<LoadResult> {
+      if (!id.endsWith('.js')) {
+        return null;
+      }
+      try {
+        const code = await fs.readFile(id, 'utf8');
+        if (code.includes('sourceMappingURL')) {
+          const mapPath = code.match(/sourceMappingURL=(.*)/)?.[1];
+          if (!mapPath) {
+            this.warn({ message: `Could not find map path in file ${id}`, id });
+            return null;
+          }
+          const basePath = path.dirname(id);
+          const absoluteMapPath = path.join(basePath, mapPath);
+          const map = JSON.parse(await fs.readFile(absoluteMapPath, 'utf8'));
+          return { code, map };
+        }
+        return { code, map: null };
+      } catch (e) {
+        this.warn({ message: toString(e), id });
+        return null;
+      }
+    },
+  };
+}

package/support/bin/rollup.ts

@@ -2,40 +2,36 @@ import commonjsRequire from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import terser from '@rollup/plugin-terser';
 import jsonImport from '@rollup/plugin-json';
-import sourceMaps from 'rollup-plugin-sourcemaps';
-import replace from '@rollup/plugin-replace';
 import type { RollupOptions } from 'rollup';
 
 import { RootIndex } from '@travetto/manifest';
 
-import { getEntry, getOutput, getTerserConfig, getFiles } from './config';
+import { getEntry, getOutput, getTerserConfig, getFiles, getIgnoredModules } from './config';
 import { travettoImportPlugin } from './rollup-esm-dynamic-import';
+import { sourcemaps } from './rollup-sourcemaps';
 
-const NEVER_INCLUDE = new Set(['@parcel/watcher']);
+const NEVER_INCLUDE = new Set<string>([]);
 
 export default function buildConfig(): RollupOptions {
   const output = getOutput();
   const entry = getEntry();
   const files = getFiles();
+  const ignore = getIgnoredModules();
+  const ignoreRe = new RegExp(`^(${ignore.join('|')})`);
 
   return {
     input: [entry],
     output,
     plugins: [
       jsonImport(),
-      replace({
-        values: {
-          ['#!' + '/usr/bin/env node']: '' // Strip out shebang
-        }
-      }),
       commonjsRequire({
-        ignore: id => NEVER_INCLUDE.has(id),
+        ignore: id => ignoreRe.test(id) || NEVER_INCLUDE.has(id),
         dynamicRequireRoot: RootIndex.manifest.workspacePath,
         dynamicRequireTargets: (output.format === 'commonjs' ? files : [])
       }),
       ...(output.format === 'module' ? [travettoImportPlugin(entry, files)] : []),
       nodeResolve({ preferBuiltins: true }),
-      ...(output.sourcemap !== 'hidden' && output.sourcemap !== false ? [sourceMaps({})] : []),
+      ...(output.sourcemap !== 'hidden' && output.sourcemap !== false ? [sourcemaps()] : []),
       ...(output.compact ? [terser(getTerserConfig())] : [])
     ]
   };

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/pack.base.ts

@@ -15,7 +15,11 @@ export type PackOperationShape<T> = ((config: T) => AsyncIterable<string[]>);
 export abstract class BasePackCommand implements CliCommandShape {
 
   static get entryPoints(): string[] {
-    return RootIndex.findSupport({ filter: x => x.includes('entry.') })
+    return RootIndex.find({
+      module: m => m.prod,
+      folder: f => f === 'support',
+      file: f => f.sourceFile.includes('entry.')
+    })
       .map(x => x.import.replace(/[.][^.]+s$/, ''));
   }