From cbfb01b29a54062683e07a5512ac6c5642aa5b77 Mon Sep 17 00:00:00 2001
From: Ignacio Tartavull <tartavull@gmail.com>
Date: Fri, 14 Jul 2017 10:08:20 -0400
Subject: [PATCH] chore: reduce memory usage of webpack

webpack for build-min is called with --max_old_space_size=2048
which seems to make travis work again, but we don't know
exactly what this flag is doing, and what was the default
value that we were using.

https://github.com/nodejs/node/issues/7937

This commit also clean some vestigial code from .travis.yaml that
is not needed now that we test inside the docker container.
---
 .travis.yml  | 10 ----------
 package.json | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a76e2041f..eb6ba9099 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,19 +3,9 @@ dist: trusty
 sudo: required
 node_js:
 - 7.3.0
-julia:
-  0.5.1
 cache:
   directories:
   - node_modules
-addons:
-  apt:
-    packages:
-    - mesa-utils
-    - xvfb
-    - libgl1-mesa-dri
-    - libglapi-mesa
-    - libosmesa6
 before_install:
 - openssl aes-256-cbc -K $encrypted_5d2bae8122b8_key -iv $encrypted_5d2bae8122b8_iv
   -in credentials.tar.gz.enc -out credentials.tar.gz -d
diff --git a/package.json b/package.json
index a20b7034d..bbe87d61e 100644
--- a/package.json
+++ b/package.json
@@ -12,10 +12,10 @@
   },
   "scripts": {
     "generate-code": "node ./config/generate_code.js",
-    "build-min": "webpack --config ./config/webpack.min.js --display-modules",
-    "build": "webpack --config ./config/webpack.config.js --display-modules",
-    "build-key_name_logger": "webpack --config ./config/webpack.key_name_logger.js",
-    "build:watch": "webpack --config ./config/webpack.config.js --watch",
+    "build-min": "node --max_old_space_size=2048 ./node_modules/webpack/bin/webpack.js --config ./config/webpack.min.js --display-modules",
+    "build": "node --max_old_space_size=2048 --config ./config/webpack.config.js --display-modules",
+    "build-key_name_logger": "node --max_old_space_size=2048 --config ./config/webpack.key_name_logger.js",
+    "build:watch": "node --max_old_space_size=2048 --config ./config/webpack.config.js --watch",
     "dev-server": "webpack-dev-server --config ./config/webpack.config.js",
     "test": "karma start ./config/karma.conf.js --single-run",
     "test:watch": "karma start ./config/karma.conf.js --no-single-run",
@@ -70,19 +70,19 @@
     "gl-matrix": "^2.3.2",
     "glsl-editor": "^1.0.0",
     "glsl-strip-comments-loader": "^1.0.0",
-    "html-webpack-plugin": "^2.28.0",
+    "html-webpack-plugin": "^2.29.0",
     "json-loader": "^0.5.4",
     "lodash": "^4.13.1",
     "nifti-reader-js": "^0.5.3",
     "pako": "^1.0.1",
-    "raw-loader": "^0.5.1",
-    "signals": "^1.0.0",
-    "sockjs-client": "^1.1.2",
-    "sortablejs": "^1.5.0-rc1",
-    "style-loader": "^0.13.0",
+    "raw-loader": "0.5.1",
+    "signals": "1.0.0",
+    "sockjs-client": "1.1.2",
+    "sortablejs": "1.5.0-rc1",
+    "style-loader": "0.13.0",
     "ts-loader": "1.3.2",
-    "typescript": "^2.1.4",
-    "webpack": "^2.2.0-rc.3",
-    "webpack-closure-compiler": "^2.1.2"
+    "typescript": "2.3.4",
+    "webpack": "2.2.0-rc.3",
+    "webpack-closure-compiler": "2.1.2"
   }
 }