Merge branch 'master' into confirmation-dialog

blackbaud · Nov 18, 2017 · 4ad136c · 4ad136c
2 parents a01e525 + 4e8c286
commit 4ad136c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "@angular/platform-browser-dynamic": "4.3.6",
     "@angular/router": "4.3.6",
     "@blackbaud/skyux": "2.3.2",
-    "@blackbaud/skyux-builder": "1.6.2",
+    "@blackbaud/skyux-builder": "1.7.1",
     "@blackbaud/skyux-design-tokens": "0.0.8",
     "@blackbaud/stache": "2.1.0",
     "@types/core-js": "0.9.41",

diff --git a/scripts/travis-script-build.sh b/scripts/travis-script-build.sh
@@ -5,7 +5,7 @@ set -e
 if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then
   # Building SKY UX requires a lot of memory:
   # https://github.com/npm/npm/issues/12238#issuecomment-301645764
-  node --max-old-space-size=4096 `which npm` run build:skyux
+  skyux build --output-keep-alive
 else
   echo -e "Pull requests from forks are run via Savage."
 fi