.gitignore

@@ -6,3 +6,13 @@
 
 # logs
 npm-debug.log
+
+# General macOS
+.DS_Store
+examples/.DS_Store
+
+# Example pkg'd application
+examples/express/express-example
+
+# Example dependencies
+examples/express/node_modules

.travis.yml

@@ -1,6 +1,6 @@
 language:
   - node_js
-node_js: 10
+node_js: 12
 services:
   - mongodb
 sudo: true

README.md

@@ -1,4 +1,4 @@
-![](http://res.cloudinary.com/zeit-inc/image/upload/v1509936789/repositories/pkg/pkg-banner.png)
+![](http://res.cloudinary.com/zeit-inc/image/upload/v1509936789/repositories/pkg/pkg-repo-banner-new.png)
 
 [![Build Status](https://travis-ci.org/zeit/pkg.svg?branch=master)](https://travis-ci.org/zeit/pkg)
 [![Coverage Status](https://coveralls.io/repos/github/zeit/pkg/badge.svg?branch=master)](https://coveralls.io/github/zeit/pkg?branch=master)
@@ -45,12 +45,12 @@ option. A canonical target consists of 3 elements, separated by
 dashes, for example `node6-macos-x64` or `node4-linux-armv6`:
 
 * **nodeRange** node${n} or latest
-* **platform** freebsd, linux, macos, win
+* **platform** freebsd, linux, alpine, macos, win
 * **arch** x64, x86, armv6, armv7
 
 You may omit any element (and specify just `node6` for example).
 The omitted elements will be taken from current platform or
-system-wide Node.js installation (it's version and arch).
+system-wide Node.js installation (its version and arch).
 There is also an alias `host`, that means that all 3 elements
 are taken from current platform/Node.js. By default targets are
 `linux,macos,win` for current Node.js version and arch.
@@ -77,6 +77,10 @@ your `package.json` file.
     "assets": "views/**/*"
   }
 ```
+You may also specify arrays of globs:
+```
+    "assets": [ "assets/**/*", "images/**/*" ]
+```
 Just be sure to call `pkg package.json` or `pkg .` to make use
 of `scripts` and `assets` entries.
 

dictionary/google-closure-compiler-java.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = {
+  pkg: {
+    patches: {
+      'index.js': [
+        'require.resolve(\'./compiler.jar\')',
+        'require(\'path\').join(require(\'path\').dirname(process.execPath), \'compiler/compiler.jar\')'
+      ]
+    },
+    deployFiles: [
+      [ 'compiler.jar', 'compiler/compiler.jar' ]
+    ]
+  }
+};

dictionary/sqip.js

@@ -0,0 +1,8 @@
+'use strict';
+
+/**
+ * primitive Binaries must be installed on the system.
+ * e.g. go get -u github.com/fogleman/primitive
+ */
+module.exports = {
+};

dictionary/svgo.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  pkg: {
+    scripts: [
+      'lib/**/*.js',
+      'plugins/*.js'
+    ],
+    assets: [
+      '.svgo.yml'
+    ]
+  }
+};

dictionary/tinify.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = {
+  pkg: {
+    assets: [
+      'lib/data/cacert.pem'
+    ]
+  }
+};

examples/express/package.json

@@ -10,7 +10,7 @@
       "views/**/*"
     ],
     "targets": [
-      "node7"
+      "node8"
     ]
   }
 }

examples/express/readme.md

@@ -1 +1,15 @@
-Run `pkg .` here!
+# Express-Example
+
+> This example illustrates using `pkg` on a simple Express based app
+
+## Instructions
+
+  1. Run `npm install`
+  2. Run `pkg .`
+
+  That's it!
+
+## Post Success Notes
+
+  * Upon success, `pkg` will create an executable named "express-example". This file can be found at the root of the example project directory.
+  * To see the app in action, run the executable then navigate to http://localhost:8080/ in your browser.

lib/detector.js

@@ -333,7 +333,7 @@ module.exports.parse = function (body) {
     allowImportExportEverywhere: true,
     allowReturnOutsideFunction: true,
     ecmaVersion: 8,
-    plugins: [ 'estree', 'objectRestSpread' ]
+    plugins: [ 'estree' ]
   });
 };
 

lib/fabricator.js

@@ -44,7 +44,8 @@ const children = {};
 export function fabricate (bakes, fabricator, snap, body, cb) {
   bakes = bakes.filter(function (bake) {
     // list of bakes that don't influence the bytecode
-    return ![ '--prof', '--v8-options' ].includes(bake);
+    const bake2 = bake.replace(/_/g, '-');
+    return ![ '--prof', '--v8-options', '--trace-opt', '--trace-deopt' ].includes(bake2);
   });
 
   const cmd = fabricator.binaryPath;

lib/follow.js

@@ -1,15 +1,20 @@
+import fs from 'fs';
 import { sync } from 'resolve';
 
 export default function follow (x, opts) {
+  // TODO async version
   return new Promise((resolve) => {
-    resolve(sync(x, opts));
-    // TODO own implementation with foreign tests
-    // TODO async follow
-/*
-    resolve_(x, opts, (error, result) => {
-      if (error) return reject(error);
-      resolve(result);
-    });
-*/
+    resolve(sync(x, {
+      basedir: opts.basedir,
+      extensions: opts.extensions,
+      readFileSync: (file) => {
+        opts.readFile(file);
+        return fs.readFileSync(file);
+      },
+      packageFilter: (config, base) => {
+        opts.packageFilter(config, base);
+        return config;
+      }
+    }));
   });
 }

lib/index.js

@@ -1,3 +1,5 @@
+/* eslint-disable require-atomic-updates */
+
 import { exists, mkdirp, readFile, remove, stat } from 'fs-extra';
 import { log, wasReported } from './log.js';
 import { need, system } from 'pkg-fetch';

lib/producer.js

@@ -1,10 +1,10 @@
 import { STORE_BLOB, STORE_CONTENT, snapshotify } from '../prelude/common.js';
 import { log, wasReported } from './log.js';
+import Multistream from 'multistream';
 import assert from 'assert';
 import { fabricateTwice } from './fabricator.js';
 import fs from 'fs';
 import intoStream from 'into-stream';
-import multistream from 'multistream';
 import streamMeter from 'stream-meter';
 
 function discoverPlaceholder (binaryBuffer, searchString, padder) {
@@ -115,7 +115,7 @@ export default function ({ backpack, bakes, slash, target }) {
     let preludePosition;
     let preludeSize;
 
-    multistream((cb) => {
+    new Multistream((cb) => {
       if (count === 0) {
         return cb(undefined, next(
           intoStream(binaryBuffer)

lib/refiner.js

@@ -2,6 +2,8 @@ import { STORE_LINKS, retrieveDenominator,
   substituteDenominator } from '../prelude/common.js';
 import path from 'path';
 
+const win32 = process.platform === 'win32';
+
 function hasParent (file, records) {
   const dirname = path.dirname(file);
   if (dirname === file) return false; // root directory
@@ -37,8 +39,6 @@ function purgeTopDirectories (records) {
   }
 }
 
-const win32 = process.platform === 'win32';
-
 function denominate (records, entrypoint, denominator) {
   const newRecords = {};
 

lib/walker.js

@@ -1,3 +1,5 @@
+/* eslint-disable require-atomic-updates */
+
 import { ALIAS_AS_RELATIVE, ALIAS_AS_RESOLVABLE,
   STORE_BLOB, STORE_CONTENT, STORE_LINKS, STORE_STAT,
   isDotJS, isDotJSON, isDotNODE, isPackageJson, normalizePath
@@ -12,14 +14,7 @@ import globby from 'globby';
 import natives from './natives.js';
 import path from 'path';
 
-function shortFromAlias (alias) {
-  // alias = fs-promise or @types/node
-  if (alias[0] === '@') {
-    return alias.match(/^([^\\/]+[\\/][^\\/]+)/)[0];
-  } else {
-    return alias.match(/^[^\\/]+/)[0];
-  }
-}
+const win32 = process.platform === 'win32';
 
 function isPublic (config) {
   if (config.private) return false;
@@ -65,8 +60,9 @@ function upon (p, base) {
     p = p.slice(1);
     negate = true;
   }
-  if (!path.isAbsolute(p)) {
-    p = path.join(base, p);
+  p = path.join(base, p);
+  if (win32) {
+    p = p.replace(/\\/g, '/');
   }
   if (negate) {
     p = '!' + p;
@@ -409,28 +405,29 @@ class Walker {
   }
 
   async stepDerivatives_ALIAS_AS_RESOLVABLE (record, marker, derivative) { // eslint-disable-line camelcase
-    const catcher = {};
     let stage = 0;
     let newPackage;
     let newMarker;
 
-    catcher.readFileSync = (file) => {
-      // only first occurence from loadNodeModulesSync
-      if (stage === 2) return;
-      assert(stage === 0);
+    // was taken from resolve/lib/sync.js
+    const isNear = /^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[\\/])/;
+    const near = isNear.test(derivative.alias);
+
+    const catchReadFile = (file) => {
+      if (near) return;
+      if (stage !== 0) return;
       assert(isPackageJson(file), 'walker: ' +
         file + ' must be package.json');
       newPackage = file;
       newMarker = undefined;
       stage = 1;
-      return fs.readFileSync(file);
     };
 
-    catcher.packageFilter = (config, base) => {
-      assert(stage === 1);
+    const catchPackageFilter = (config, base) => {
+      if (near) return;
+      if (stage !== 1) return;
       newMarker = { config, configPath: newPackage, base };
       stage = 2;
-      return config;
     };
 
     let newFile, failure;
@@ -443,42 +440,13 @@ class Walker {
         // is not taken in require('./typos')
         // in 'normalize-package-data/lib/fixer.js'
         extensions: [ '.js', '.json', '.node' ],
-        readFileSync: catcher.readFileSync,
-        packageFilter: catcher.packageFilter
+        readFile: catchReadFile,
+        packageFilter: catchPackageFilter
       });
     } catch (error) {
       failure = error;
     }
 
-    // was taken from resolve/lib/sync.js
-    const isNear = /^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[\\/])/;
-    let mainNotFound = false;
-
-    if (!isNear.test(derivative.alias)) {
-      const short = shortFromAlias(derivative.alias);
-      // 'npm' !== 'npm/bin/npm-cli.js'
-      if (short !== derivative.alias) {
-        try {
-          await follow(short, {
-            basedir: path.dirname(record.file),
-            extensions: [ '.js', '.json', '.node' ],
-            readFileSync: catcher.readFileSync,
-            packageFilter: catcher.packageFilter
-          });
-        } catch (error) {
-          // the purpose is to fire 'packageFilter'
-          // in cases like require('npm/bin/npm-cli.js')
-          // because otherwise it will not be fired
-          // (only loadAsFileSync is executed)
-        }
-      }
-      // 'babel-runtime' === 'babel-runtime'
-      if (short === derivative.alias) {
-        mainNotFound = failure && newMarker &&
-          newMarker.config && !newMarker.config.main;
-      }
-    }
-
     assert((newPackage && newMarker) ||
            (!newPackage && !newMarker), 'Probably, package.json is malformed');
 
@@ -493,6 +461,7 @@ class Walker {
 
     if (failure) {
       const { toplevel } = marker;
+      const mainNotFound = !newFile && newMarker;
       const debug = !toplevel || derivative.mayExclude ||
         (mainNotFound && derivative.fromDependencies);
       const level = debug ? 'debug' : 'warn';