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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.1.0-rc.2",
+  "version": "3.1.0-rc.4",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",

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 {}
+export const RUNTIME_MODULES = 'trv_node_modules';
 
-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 makeIntro = (doImport: (name: string) => string): string => `
+try { (${doImport('child_process')}).execFileSync('mkdir -p node_modules/ && cp -r ${RUNTIME_MODULES}/* node_modules/', { shell:true}); } catch {}
+try { globalThis.crypto = ${doImport('crypto')}; } catch {}
+try { ${doImport('./.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

@@ -7,6 +7,7 @@ import { cliTpl } from '@travetto/cli';
 import { CommonPackConfig } from './types';
 import { PackUtil } from './util';
 import { ActiveShellCommand, ShellCommands } from './shell';
+import { RUNTIME_MODULES } from './config';
 
 async function writeRawFile(file: string, contents: string, mode?: string): Promise<void> {
   await fs.writeFile(file, contents, { encoding: 'utf8', mode });
@@ -97,7 +98,7 @@ export class PackOperation {
    */
   static async * writePackageJson(cfg: CommonPackConfig): AsyncIterable<string[]> {
     const file = 'package.json';
-    const pkg = { type: RootIndex.manifest.moduleType };
+    const pkg = { type: RootIndex.manifest.moduleType, main: `${cfg.mainName}.js` };
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing' }} ${{ path: file }}`);
 
@@ -233,6 +234,22 @@ export class PackOperation {
     }
   }
 
+  /**
+   * Duplicate node_modules
+   */
+  static async * duplicateNodeModules(cfg: CommonPackConfig): AsyncIterable<string[]> {
+    const src = path.resolve(cfg.workspace, 'node_modules');
+    const dest = path.resolve(cfg.workspace, RUNTIME_MODULES);
+
+    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Creating a Copy of Node Modules' }} ${{ path: path.join('node_modules') }}`);
+
+    if (cfg.ejectFile) {
+      yield ActiveShellCommand.copyRecursive(src, dest);
+    } else {
+      await PackUtil.copyRecursive(src, dest);
+    }
+  }
+
   /**
    * Generate ZIP file for workspace
    */
@@ -242,9 +259,11 @@ export class PackOperation {
 
     if (cfg.ejectFile) {
       yield ActiveShellCommand.chdir(cfg.workspace);
+      await ActiveShellCommand.mkdir(path.dirname(cfg.output));
       yield ActiveShellCommand.zip(cfg.output);
       yield ActiveShellCommand.chdir(path.cwd());
     } else {
+      await fs.mkdir(path.dirname(cfg.output), { recursive: true });
       const [cmd, ...args] = ActiveShellCommand.zip(cfg.output);
       await ExecUtil.spawn(cmd, args, { cwd: cfg.workspace }).result;
     }

package/support/pack.base.ts

@@ -69,6 +69,7 @@ export abstract class BasePackCommand implements CliCommandShape {
       PackOperation.writeEntryScript,
       PackOperation.copyResources,
       PackOperation.writeManifest,
+      PackOperation.duplicateNodeModules,
       PackOperation.bundle,
     ];
   }