@travetto/pack 3.4.0-rc.4 → 3.4.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.4.0-rc.4",
+  "version": "3.4.0-rc.6",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -29,11 +29,10 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@travetto/base": "^3.4.0-rc.0",
-    "rollup": "^4.1.5",
-    "rollup-plugin-sourcemaps": "^0.6.3"
+    "rollup": "^4.1.5"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.0-rc.0"
+    "@travetto/cli": "^3.4.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

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]))
   ]

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,13 +2,13 @@ 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 type { RollupOptions } from 'rollup';
 
 import { RootIndex } from '@travetto/manifest';
 
 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<string>([]);
 
@@ -31,7 +31,7 @@ export default function buildConfig(): RollupOptions {
       }),
       ...(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())] : [])
     ]
   };