@travetto/pack 8.0.0-alpha.3 → 8.0.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "8.0.0-alpha.3",
+  "version": "8.0.0-alpha.5",
   "type": "module",
   "description": "Code packing utilities",
   "keywords": [
@@ -29,13 +29,13 @@
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/runtime": "^8.0.0-alpha.2",
-    "@travetto/terminal": "^8.0.0-alpha.2",
+    "@rollup/plugin-terser": "^1.0.0",
+    "@travetto/runtime": "^8.0.0-alpha.3",
+    "@travetto/terminal": "^8.0.0-alpha.3",
     "rollup": "^4.59.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.3"
+    "@travetto/cli": "^8.0.0-alpha.4"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

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

@@ -1,4 +1,5 @@
 import type { AstNode, Plugin } from 'rollup';
+// @ts-expect-error - This module lacks types
 import { walk } from 'estree-walker';
 import magicString from 'magic-string';
 
@@ -33,16 +34,14 @@ export function travettoImportPlugin(config: CoreRollupConfig): Plugin {
       let ms: magicString | undefined;
 
       walk(parsed, {
-        enter: (node) => {
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          const impNode = node as TNode;
-          if (impNode.type === 'ImportExpression' && impNode.source?.type !== 'Literal') {
-            if (!/["']/.test(code.substring(impNode.start, impNode.end))) {
-              (ms ??= new magicString(code)).overwrite(impNode.start, impNode.start + 6, GLOBAL_IMPORT);
+        enter: (node: TNode) => {
+          if (node.type === 'ImportExpression' && node.source?.type !== 'Literal') {
+            if (!/["']/.test(code.substring(node.start, node.end))) {
+              (ms ??= new magicString(code)).overwrite(node.start, node.start + 6, GLOBAL_IMPORT);
             }
-          } else if (impNode.type === 'CallExpression' && impNode.callee?.type === 'Identifier' && impNode.callee.name === 'require') {
-            if (!/["']/.test(code.substring(impNode.start, impNode.end))) {
-              (ms ??= new magicString(code)).overwrite(impNode.start, impNode.start + 7, GLOBAL_IMPORT);
+          } else if (node.type === 'CallExpression' && node.callee?.type === 'Identifier' && node.callee.name === 'require') {
+            if (!/["']/.test(code.substring(node.start, node.end))) {
+              (ms ??= new magicString(code)).overwrite(node.start, node.start + 7, GLOBAL_IMPORT);
             }
           }
         }

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

@@ -18,7 +18,7 @@ export function travettoSourcemaps(config: CoreRollupConfig): Plugin {
   return {
     name: 'travetto-source-maps',
     async load(this: PluginContext, id: string): Promise<LoadResult> {
-      if (!id.endsWith('.js')) {
+      if (!id.endsWith('.js') || id.endsWith('@travetto/runtime/support/polyfill.js')) {
         return null;
       }
       try {
@@ -31,7 +31,10 @@ export function travettoSourcemaps(config: CoreRollupConfig): Plugin {
           }
           const loader = new FileLoader([path.dirname(id)]);
           const map = await loader.readText(mapPath)
-            .then(JSONUtil.fromBase64<SourceMapInput>);
+            .then(value => value.startsWith('{') ?
+              JSONUtil.fromUTF8<SourceMapInput>(value) :
+              JSONUtil.fromBase64<SourceMapInput>(value)
+            );
           return { code, map };
         }
         return { code, map: null };