@travetto/pack 3.0.2-rc.1 → 3.0.2

package/README.md

@@ -33,7 +33,7 @@ Options:
   -c, --no-clean                      Disables: Clean workspace
   -o, --output <output>               Output location
   -es, --main-scripts <main-scripts>  Create entry scripts
-  -f, --main-name <main-name>         Main name for build artifact (default: "cli")
+  -f, --main-name <main-name>         Main name for build artifact
   -e, --entry-point <entry-point>     Entry point (default: "@travetto/cli/support/entry.cli")
   -m, --no-minify                     Disables: Minify output
   -sm, --sourcemap                    Bundle source maps
@@ -95,7 +95,7 @@ Options:
   -c, --no-clean                      Disables: Clean workspace
   -o, --output <output>               Output location (default: "travetto_pack.zip")
   -es, --main-scripts <main-scripts>  Create entry scripts
-  -f, --main-name <main-name>         Main name for build artifact (default: "cli")
+  -f, --main-name <main-name>         Main name for build artifact
   -e, --entry-point <entry-point>     Entry point (default: "@travetto/cli/support/entry.cli")
   -m, --no-minify                     Disables: Minify output
   -sm, --sourcemap                    Bundle source maps
@@ -119,7 +119,7 @@ Options:
   -c, --no-clean                            Disables: Clean workspace
   -o, --output <output>                     Output location
   -es, --main-scripts <main-scripts>        Create entry scripts
-  -f, --main-name <main-name>               Main name for build artifact (default: "cli")
+  -f, --main-name <main-name>               Main name for build artifact
   -e, --entry-point <entry-point>           Entry point (default: "@travetto/cli/support/entry.cli")
   -m, --no-minify                           Disables: Minify output
   -sm, --sourcemap                          Bundle source maps
@@ -178,23 +178,23 @@ echo "Writing package.json
 "
 echo "{\"type\":\"commonjs\"}" > $DIST/package.json
 
-# Writing entry scripts cli.sh args=(run rest) 
+# Writing entry scripts entry.cli.sh args=(run rest) 
 
-echo "Writing entry scripts cli.sh args=(run rest)
+echo "Writing entry scripts entry.cli.sh args=(run rest)
 "
-echo "#!/bin/sh" > $DIST/cli.sh
-echo "cd \$(dirname \"\$0\")" >> $DIST/cli.sh
-echo "node cli.js run rest \$@" >> $DIST/cli.sh
-chmod 755 $DIST/cli.sh
+echo "#!/bin/sh" > $DIST/entry.cli.sh
+echo "cd \$(dirname \"\$0\")" >> $DIST/entry.cli.sh
+echo "node entry.cli.js run rest \$@" >> $DIST/entry.cli.sh
+chmod 755 $DIST/entry.cli.sh
 
-# Writing entry scripts cli.cmd args=(run rest) 
+# Writing entry scripts entry.cli.cmd args=(run rest) 
 
-echo "Writing entry scripts cli.cmd args=(run rest)
+echo "Writing entry scripts entry.cli.cmd args=(run rest)
 "
-echo "" > $DIST/cli.cmd
-echo "cd %~p0" >> $DIST/cli.cmd
-echo "node cli.js run rest %*" >> $DIST/cli.cmd
-chmod 755 $DIST/cli.cmd
+echo "" > $DIST/entry.cli.cmd
+echo "cd %~p0" >> $DIST/entry.cli.cmd
+echo "node entry.cli.js run rest %*" >> $DIST/entry.cli.cmd
+chmod 755 $DIST/entry.cli.cmd
 
 # Copying over resources 
 
@@ -224,7 +224,7 @@ TRV_MODULE=$MOD npx trv manifest $DIST/node_modules/$MOD prod
 echo "Bundling Output minify=true sourcemap= entryPoint=@travetto/cli/support/entry.cli
 "
 export BUNDLE_ENTRY=node_modules/@travetto/cli/support/entry.cli.js
-export BUNDLE_MAIN_FILE=cli.js
+export BUNDLE_MAIN_FILE=entry.cli.js
 export BUNDLE_COMPRESS=true
 export BUNDLE_OUTPUT=$DIST
 export BUNDLE_FORMAT=commonjs
@@ -241,7 +241,7 @@ echo "FROM node:18-alpine3.16" > $DIST/Dockerfile
 echo "WORKDIR /app" >> $DIST/Dockerfile
 echo "COPY . ." >> $DIST/Dockerfile
 echo "" >> $DIST/Dockerfile
-echo "ENTRYPOINT [\"/app/cli.sh\"]" >> $DIST/Dockerfile
+echo "ENTRYPOINT [\"/app/entry.cli.sh\"]" >> $DIST/Dockerfile
 
 # Pulling Docker Base Image node:18-alpine3.16 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.0.2-rc.1",
+  "version": "3.0.2",
   "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.0.2-rc.1",
+    "@travetto/base": "^3.0.2",
     "rollup": "^3.17.2",
     "rollup-plugin-sourcemaps": "^0.6.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.0.2-rc.1"
+    "@travetto/cli": "^3.0.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/pack.base.ts

@@ -44,7 +44,7 @@ export abstract class BasePackCommand<T extends CommonPackOptions, S extends Com
       clean: this.boolOption({ short: 'c', desc: 'Clean workspace', def: true }),
       output: this.option({ short: 'o', desc: 'Output location' }),
       mainScripts: this.option({ short: 'es', desc: 'Create entry scripts' }),
-      mainName: this.option({ short: 'f', desc: 'Main name for build artifact', def: path.basename(mainEntry).replace(/entry[.]/, '') }),
+      mainName: this.option({ short: 'f', desc: 'Main name for build artifact' }),
       entryPoint: this.option({ short: 'e', desc: 'Entry point', def: mainEntry }),
       minify: this.boolOption({ short: 'm', desc: 'Minify output', def: true }),
       sourcemap: this.boolOption({ short: 'sm', desc: 'Bundle source maps' }),
@@ -96,6 +96,7 @@ export abstract class BasePackCommand<T extends CommonPackOptions, S extends Com
   async buildConfig(): Promise<S> {
     this.cmd.workspace ??= path.resolve(os.tmpdir(), RootIndex.mainModule.sourcePath.replace(/[\/\\: ]/g, '_'));
     this.cmd.module = RootIndex.mainModule.name;
+    this.cmd.mainName ??= path.basename(this.cmd.entryPoint);
     return this.cmd;
   }