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

package/README.md

@@ -167,7 +167,7 @@ mkdir -p $DIST
 
 echo "Writing .env.js"
 
-echo "process.env.TRV_MANIFEST = 'node_modules/$MOD';" > $DIST/.env.js
+echo "process.env.TRV_MANIFEST = 'manifest.json';" > $DIST/.env.js
 echo "process.env.TRV_MODULE = '$MOD';" >> $DIST/.env.js
 echo "process.env.TRV_CLI_IPC = '';" >> $DIST/.env.js
 
@@ -175,7 +175,7 @@ echo "process.env.TRV_CLI_IPC = '';" >> $DIST/.env.js
 
 echo "Writing package.json"
 
-echo "{\"type\":\"commonjs\"}" > $DIST/package.json
+echo "{\"type\":\"commonjs\",\"main\":\"todo-app.js\"}" > $DIST/package.json
 
 # Writing entry scripts todo-app.sh args=(run:rest) 
 
@@ -199,17 +199,13 @@ chmod 755 $DIST/todo-app.cmd
 
 echo "Copying over resources"
 
-mkdir -p $DIST/node_modules/$MOD
-cp $TRV_OUT/node_modules/$MOD/package.json $DIST/node_modules/$MOD/package.json
-mkdir -p $DIST/node_modules/@travetto/manifest
-cp $TRV_OUT/node_modules/@travetto/manifest/package.json $DIST/node_modules/@travetto/manifest/package.json
 cp -r -p $ROOT/resources $DIST/resources
 
-# Writing Manifest node_modules/$MOD 
+# Writing Manifest manifest.json 
 
-echo "Writing Manifest node_modules/$MOD"
+echo "Writing Manifest manifest.json"
 
-TRV_MODULE=$MOD npx trv manifest $DIST/node_modules/$MOD prod
+TRV_MODULE=$MOD npx trv manifest $DIST/manifest.json prod
 
 # Bundling Output minify=true sourcemap=false entryPoint=@travetto/cli/support/entry.cli 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.1.0-rc.3",
+  "version": "3.1.0-rc.5",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -28,12 +28,12 @@
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-terser": "^0.4.0",
-    "@travetto/base": "^3.1.0-rc.0",
+    "@travetto/base": "^3.1.0-rc.1",
     "rollup": "^3.17.2",
     "rollup-plugin-sourcemaps": "^0.6.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.1.0-rc.2"
+    "@travetto/cli": "^3.1.0-rc.3"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/config.ts

@@ -1,26 +1,23 @@
 import type { OutputOptions } from 'rollup';
+import { __importStar } from 'tslib';
+
 import type terser from '@rollup/plugin-terser';
 
 import { Env } from '@travetto/base';
 import { ManifestModule, ManifestModuleUtil, Package, path, RootIndex } from '@travetto/manifest';
 
-const INTRO = {
-  commonjs: `
-try { globalThis.crypto = require('crypto'); } catch {}
-try { require('./.env.js')} catch {}
+const makeIntro = (doImport: (name: string) => string, ...extra: string[]): string => [
+  `try { globalThis.crypto = ${doImport('crypto')}; } catch {}`,
+  `try { ${doImport('./.env.js')} } catch {}`,
+  ...extra
+].map(x => x.trim()).join('\n');
 
-function __importStar(mod) { 
-  if (mod && mod.__esModule) return mod;
-  var result = {};
-  if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-  result['default'] = mod;
-  return result;
-}
-`,
-  module: `
-tyr{ globalThis.crypto = await import('crypto'); } catch {}
-try {await import('./.env.js')} catch {}
-`
+const INTRO = {
+  commonjs: makeIntro(
+    v => `require('${v}')`,
+    __importStar.toString().replace(/function([^(]+)/, 'function __importStar'),
+  ),
+  module: makeIntro(v => `await import('${v}')`)
 };
 
 function getFilesFromModule(m: ManifestModule): string[] {

package/support/bin/operation.ts

@@ -120,7 +120,7 @@ export class PackOperation {
   static async * writeEnv(cfg: CommonPackConfig): AsyncIterable<string[]> {
     const file = '.env.js';
     const env = {
-      TRV_MANIFEST: `node_modules/${cfg.module}`,
+      TRV_MANIFEST: 'manifest.json',
       TRV_MODULE: cfg.module,
       TRV_CLI_IPC: ''
     };
@@ -184,31 +184,13 @@ export class PackOperation {
       dest: path.resolve(cfg.workspace, 'resources')
     };
 
-    const copyFiles = [
-      RootIndex.manifest.modules[RootIndex.mainModule.name],
-      RootIndex.manifest.modules['@travetto/manifest']
-    ].map(mod => ({
-      src: path.resolve(RootIndex.outputRoot, mod.outputFolder, 'package.json'),
-      dest: path.resolve(cfg.workspace, mod.outputFolder, 'package.json'),
-      destFolder: path.resolve(cfg.workspace, mod.outputFolder)
-    }));
-
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Copying over resources' }}`);
 
     if (cfg.ejectFile) {
-      yield* copyFiles.flatMap(mod => [
-        ActiveShellCommand.mkdir(path.dirname(mod.dest)),
-        ActiveShellCommand.copy(mod.src, mod.dest)
-      ]);
       if (resources.count) {
         yield ActiveShellCommand.copyRecursive(resources.src, path.resolve(cfg.workspace, 'resources'));
       }
     } else {
-      for (const { src, dest, destFolder } of copyFiles) {
-        await fs.mkdir(destFolder, { recursive: true });
-        await fs.copyFile(src, dest);
-      }
-
       if (resources.count) {
         await fs.mkdir(path.dirname(resources.dest), { recursive: true });
         await PackUtil.copyRecursive(resources.src, resources.dest);
@@ -220,11 +202,11 @@ export class PackOperation {
    * Produce the output manifest, only including prod dependencies
    */
   static async * writeManifest(cfg: CommonPackConfig): AsyncIterable<string[]> {
-    const out = path.resolve(cfg.workspace, 'node_modules', cfg.module);
+    const out = path.resolve(cfg.workspace, 'manifest.json');
     const cmd = ['npx', 'trv', 'manifest', out, 'prod'];
     const env = { TRV_MODULE: cfg.module };
 
-    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing Manifest' }} ${{ path: path.join('node_modules', cfg.module) }}`);
+    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing Manifest' }} ${{ path: 'manifest.json' }}`);
 
     if (cfg.ejectFile) {
       yield [...Object.entries(env).map(([k, v]) => `${k}=${v}`), ...cmd];

package/support/pack.base.ts

@@ -101,7 +101,7 @@ export abstract class BasePackCommand implements CliCommandShape {
 
   async main(args: string[] = []): Promise<void> {
     this.entryArguments = [...args, ...this.#unknownArgs ?? []];
-    this.module ||= RootIndex.mainModule.name;
+    this.module ||= RootIndex.mainModuleName;
     this.mainName ??= path.basename(this.module);
 
     const stream = this.runOperations();