Merge ~mpontillo/maas:move-node-modules-to-top-level into maas:master

[Mike Pontillo]

Move node_modules to top level directory.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[Mike Pontillo (mpontillo)]

This change is being made because Webpack (and other node.js tools) require special configuration in order to operate when the node_modules directory is located somewhere other than the root. This change will make the MAAS development environment more consistent with regard to the expectations of the node.js platform.

diff --git a/Makefile b/Makefile
index e3f698b..eec759a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ dbrun := bin/database --preserve run --
 # Path to install local nodejs.
 mkfile_dir := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 nodejs_path := $(mkfile_dir)/include/nodejs/bin
-nodejs_modules_path := include/nodejs/node_modules
 
 export PATH := $(nodejs_path):$(PATH)
 
@@ -190,8 +189,8 @@ include/nodejs/yarn.tar.gz:
 include/nodejs/bin/yarn: include/nodejs/yarn.tar.gz
 	tar -C include/nodejs/ -xf include/nodejs/yarn.tar.gz --strip-components=1
 
-$(nodejs_modules_path): include/nodejs/bin/node  include/nodejs/bin/yarn
-	yarn --modules-folder $@
+node_modules: include/nodejs/bin/node include/nodejs/bin/yarn
+	yarn
 
 define js_bins
 	bin/karma
@@ -199,7 +198,7 @@ define js_bins
 	bin/node-sass
 endef
 
-$(strip $(js_bins)): $(nodejs_modules_path)
+$(strip $(js_bins)): node_modules
 	ln -sf ../node_modules/.bin/$(notdir $@) $@
 
 js-update-macaroonbakery:
diff --git a/src/maasserver/static/scss/build.scss b/src/maasserver/static/scss/build.scss
index 3b0aacf..3def6ee 100644
--- a/src/maasserver/static/scss/build.scss
+++ b/src/maasserver/static/scss/build.scss
@@ -3,7 +3,7 @@
 @import 'utils';
 
 // Import Vanilla framework
-@import '../../../../include/nodejs/node_modules/vanilla-framework/scss/vanilla';
+@import '../../../../node_modules/vanilla-framework/scss/vanilla';
 @include vanilla;
 
 // Import local patterns