move js build files to 'build' dir

.gitignore

@@ -15,7 +15,7 @@ node_modules/
 js/mail.min.js
 
 # packaged app
-build/
+build/artifacts
 
 # NetBeans project
 nbproject/

Makefile

@@ -35,7 +35,7 @@ install-bower-deps: bower.json install-npm-deps
 	./node_modules/bower/bin/bower install
 
 optimize-js: install-npm-deps install-bower-deps
-	./node_modules/requirejs/bin/r.js -o build.js
+	./node_modules/requirejs/bin/r.js -o build/build.js
 
 dev-setup: install-composer-deps install-npm-deps-dev install-bower-deps
 

build/build.js

@@ -9,10 +9,10 @@
  */
 
 ({
-	baseUrl: 'js',
-	mainConfigFile: 'js/require_config.js',
+	baseUrl: '../js',
+	mainConfigFile: '../js/require_config.js',
 	name: 'app',
-	out: 'js/mail.min.js',
+	out: '../js/mail.min.js',
 	insertRequire: [
 		'app',
 		'notification'