@travetto/pack 7.0.0-rc.2 → 7.0.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "7.0.0-rc.2",
+  "version": "7.0.0-rc.4",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -29,12 +29,12 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/runtime": "^7.0.0-rc.2",
-    "@travetto/terminal": "^7.0.0-rc.2",
+    "@travetto/runtime": "^7.0.0-rc.4",
+    "@travetto/terminal": "^7.0.0-rc.4",
     "rollup": "^4.53.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.2"
+    "@travetto/cli": "^7.0.0-rc.4"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/docker-operation.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { Runtime } from '@travetto/runtime';
+import { JSONUtil, Runtime } from '@travetto/runtime';
 import { cliTpl } from '@travetto/cli';
 
 import { ActiveShellCommand } from './shell.ts';
@@ -23,7 +23,7 @@ export class DockerPackOperation {
     config.dockerRuntime.os = await PackUtil.runCommand(
       ['docker', 'run', '--rm', '--entrypoint', '/bin/sh', config.dockerImage, '-c', 'cat /etc/*release*']
     ).then(out => {
-      const found = out.match(/\b(?:debian|alpine|centos)\b/i)?.[0].toLowerCase();
+      const found = out.toLowerCase().match(/\b(?:debian|alpine|centos)\b/)?.[0];
       switch (found) {
         case 'debian': case 'alpine': case 'centos': return found;
         default: return 'unknown';
@@ -82,7 +82,7 @@ export class DockerPackOperation {
       yield ActiveShellCommand.chdir(path.resolve());
     } else {
       await PackUtil.runCommand(cmd, { cwd: config.buildDirectory, stdio: [0, 'pipe', 2] });
-      const [image]: [{ Size: number }] = JSON.parse(await PackUtil.runCommand(['docker', 'inspect', config.dockerImage]));
+      const [image]: [{ Size: number }] = JSONUtil.parseSafe(await PackUtil.runCommand(['docker', 'inspect', config.dockerImage]));
       yield [cliTpl`${{ title: 'Built Docker Container  ' }} ${{ identifier: 'sizeMb' }}=${{ param: Math.trunc(image.Size / 2 ** 20) }}`];
     }
   }

package/support/rollup/rollup-travetto-sourcemaps.ts

@@ -1,7 +1,9 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
 
-import { LoadResult, Plugin, PluginContext } from 'rollup';
+import { LoadResult, Plugin, PluginContext, type SourceMapInput } from 'rollup';
+
+import { FileLoader } from '@travetto/runtime';
 
 import { CoreRollupConfig } from '../../src/types.ts';
 
@@ -27,9 +29,8 @@ export function travettoSourcemaps(config: CoreRollupConfig): Plugin {
             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'));
+          const loader = new FileLoader([path.dirname(id)]);
+          const map: SourceMapInput = await loader.readJSON(mapPath);
           return { code, map };
         }
         return { code, map: null };