Merge pull request #30 from Wikia/XW-1649-r13

XW-1649 Upgrade Node.js to v6.10
Wikia · Mar 14, 2017 · 69df35a · 69df35a
2 parents 9082d32 + 8d5fb3e
commit 69df35a
Show file tree

Hide file tree

Showing 10 changed files with 11,055 additions and 30,984 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
+loglevel="warn"
 save-exact=true
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:0.12
+FROM node:6.10
 
 # phantomjs workaround
 RUN echo -e '#!/bin/sh\necho "2.1.1"' > /bin/phantomjs

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Open http://muppet.127.0.0.1.xip.io:7001/wiki/Kermit
 * `npm run clean` - remove all dependencies and build directory
 * `npm run clean-deep` - remove all dependencies, remove build directory and clean the cache
 * `npm run svgo` - optimize all SVG files in the repository (check out `tasks/optimize-svg.sh` for details and configuration)
-* `npm run shrinkwrap` - updates shrinkwrap files which locks the version of dependencies we are using (should be run after [installing or updating a dependency](https://wikia-inc.atlassian.net/wiki/display/MER/Adding+or+updating+NodeJS+packages))
+* `npm run shrinkwrap-all` - updates shrinkwrap files which locks the version of dependencies we are using (should be run after [installing or updating a dependency](https://wikia-inc.atlassian.net/wiki/display/MER/Adding+or+updating+NodeJS+packages))
 
 ## Settings
 `server/config/settings` is main configuration structure. All application settings should be stored there.