Merge branch 'addon_build' into addon-images

bin/install-addons.js

@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2019 The xterm.js authors. All rights reserved.
+ * @license MIT
+ *
+ * Script to initialize addon packages under "addons/" with outer deps.
+ */
+
 const path = require('path');
 const cp = require('child_process');
 const fs = require('fs');
@@ -22,12 +29,12 @@ if (fs.existsSync(addonsPath)) {
       const addonPath = path.join(addonsPath, folder);
 
       // install only if there are dependencies listed
-      // also skip addon if it does not contain any package.json
-      // (might happen after branch switches)
       let packageJson;
       try {
         packageJson = require(path.join(addonPath, 'package.json'));
-      } catch (e) {}
+      } catch (e) {
+        // swallow as changing branches can leave folders around
+      }
       if (packageJson
             && (
               (packageJson.devDependencies && Object.keys(packageJson.devDependencies).length)

package.json

@@ -8,7 +8,6 @@
   "repository": "https://github.com/xtermjs/xterm.js",
   "license": "MIT",
   "scripts": {
-    "postinstall": "node -e \"try { require('./bin/install-addons'); } catch(e) {}\"",
     "prepackage": "npm run build",
     "package": "webpack",
     "start": "node demo/start",
@@ -18,7 +17,9 @@
     "test-api": "mocha \"**/*.api.js\"",
     "test-unit": "node ./bin/test.js",
     "build": "tsc -b ./tsconfig.all.json",
-    "prepare": "npm run build",
+    "prepare": "npm run setup",
+    "setup": "npm run build",
+    "presetup": "node ./bin/install-addons.js",
     "prepublishOnly": "npm run package",
     "watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput",
     "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json",