@travetto/pack 7.0.0-rc.3 → 7.0.0-rc.5

package/README.md

@@ -196,7 +196,7 @@ echo "TRV_RESOURCE_OVERRIDES=@#resources=@@#resources" >> $DIST/.env
 
 echo "Writing package.json"
 
-echo "{\"type\":\"commonjs\",\"main\":\"todo-app.js\"}" > $DIST/package.json
+echo "{\"type\":\"module\",\"main\":\"todo-app.js\"}" > $DIST/package.json
 
 # Writing entry scripts todo-app.sh args=(web:http) 
 
@@ -237,7 +237,6 @@ export BUNDLE_COMPRESS=true
 export BUNDLE_SOURCEMAP=false
 export BUNDLE_SOURCES=false
 export BUNDLE_OUTPUT=$DIST
-export BUNDLE_FORMAT=commonjs
 export BUNDLE_ENV_FILE=.env
 export TRV_MANIFEST=$TRV_OUT/node_modules/$MOD
 cd $TRV_OUT

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@travetto/pack",
-  "version": "7.0.0-rc.3",
+  "version": "7.0.0-rc.5",
+  "type": "module",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -29,12 +30,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.3",
-    "@travetto/terminal": "^7.0.0-rc.3",
-    "rollup": "^4.53.3"
+    "@travetto/runtime": "^7.0.0-rc.5",
+    "@travetto/terminal": "^7.0.0-rc.5",
+    "rollup": "^4.54.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.3"
+    "@travetto/cli": "^7.0.0-rc.5"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/operation.ts

@@ -66,7 +66,6 @@ export class PackOperation {
         ['BUNDLE_SOURCEMAP', config.sourcemap],
         ['BUNDLE_SOURCES', config.includeSources],
         ['BUNDLE_OUTPUT', config.buildDirectory],
-        ['BUNDLE_FORMAT', Runtime.workspace.type],
         ['BUNDLE_ENV_FILE', config.envFile],
         ['BUNDLE_EXTERNAL', config.externalDependencies.map(mod => mod.split(':')[0]).join(',')]
       ] as const)
@@ -101,7 +100,7 @@ export class PackOperation {
    */
   static async * writePackageJson(config: CommonPackConfig): AsyncIterable<string[]> {
     const file = 'package.json';
-    const pkg = { type: Runtime.workspace.type, main: config.mainFile };
+    const pkg = { type: 'module', main: config.mainFile };
 
     yield* PackOperation.title(config, cliTpl`${{ title: 'Writing' }} ${{ path: file }}`);
 

package/support/rollup/config.ts

@@ -3,7 +3,7 @@ import path from 'node:path';
 import type { OutputOptions } from 'rollup';
 import type terser from '@rollup/plugin-terser';
 
-import { type ManifestModule, ManifestModuleUtil, type NodeModuleType } from '@travetto/manifest';
+import { type ManifestModule, ManifestModuleUtil } from '@travetto/manifest';
 import { EnvProp, Runtime, RuntimeIndex } from '@travetto/runtime';
 
 import { CoreRollupConfig } from '../../src/types.ts';
@@ -21,21 +21,11 @@ function getFilesFromModule(mod: ManifestModule): string[] {
     .map(([file]) => ManifestModuleUtil.withOutputExtension(path.resolve(mod.outputFolder, file)));
 }
 
-function getFormat(value: string = 'commonjs'): NodeModuleType {
-  switch (value) {
-    case 'module':
-    case 'commonjs': return value;
-    default: return 'commonjs';
-  }
-}
-
 export function getOutput(): OutputOptions {
-  const format = getFormat(process.env.BUNDLE_FORMAT);
   const output = process.env.BUNDLE_OUTPUT!;
   const mainFile = process.env.BUNDLE_MAIN_FILE!;
   return {
-    format,
-    interop: format === 'commonjs' ? 'auto' : undefined,
+    format: 'module',
     sourcemapPathTransform: (source, map): string =>
       Runtime.stripWorkspacePath(path.resolve(path.dirname(map), source)),
     sourcemap: new EnvProp('BUNDLE_SOURCEMAP').bool ?? false,

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

@@ -12,12 +12,11 @@ export function travettoEntryPlugin(config: CoreRollupConfig): Plugin {
     .map(file => file.split('node_modules/').pop()!)
     .flatMap(file => file.endsWith('/__index__.js') ? [file.replace('/__index__.js', ''), file] : [file]);
 
-  const operation = config.output.format === 'module' ? 'import' : 'require';
   const importer = `
 function trvImp(path) {
   switch (path) {
-${imports.map(file => `    case '${file}': return ${operation}('${file}')`).join('\n')}
-    default: return ${operation}(path); // Fall back for built-ins
+${imports.map(file => `    case '${file}': return import('${file}')`).join('\n')}
+    default: return import(path); // Fall back for built-ins
   }
 }
 globalThis.${GLOBAL_IMPORT} = trvImp;