New build system: Webpack ✨ 📦 📑

.babelrc

@@ -0,0 +1,9 @@
+{
+    "sourceMaps": true,
+    "presets": [
+        "env"
+    ],
+    "plugins": [
+        "transform-object-rest-spread"
+    ]
+}

.eslintrc

@@ -4,6 +4,9 @@
 		"node": true,
 		"es6": true
 	},
+	"parserOptions": {
+		"sourceType": "module"
+	},
 	"extends": "eslint:recommended",
 	"rules": {
 		"indent": [

.gitignore

@@ -14,6 +14,4 @@ node_modules
 .kdev4/
 *.kdev4
 
-
-# Not Recommended, but will remove once webpack ready
-package-lock.json
+npm-debug.log

frappe/__init__.py

@@ -1462,4 +1462,4 @@ def get_version(doctype, name, limit = None, head = False, raise_err = True):
 		if raise_err:
 			raise ValueError('{doctype} has no versions tracked.'.format(
 				doctype = doctype
-			))
+			))

frappe/build.py

@@ -24,40 +24,29 @@ def setup():
 		except ImportError: pass
 	app_paths = [os.path.dirname(pymodule.__file__) for pymodule in pymodules]
 
-def bundle(no_compress, make_copy=False, restore=False, verbose=False):
+def bundle(compress=False, make_copy=False, restore=False, verbose=False):
 	"""concat / minify js files"""
 	# build js files
 	setup()
 
 	make_asset_dirs(make_copy=make_copy, restore=restore)
 
-	# new nodejs build system
-	command = 'node --use_strict ../apps/frappe/frappe/build.js --build'
-	if not no_compress:
-		command += ' --minify'
-	subprocess.call(command.split(' '))
+	frappe_app_path = app_paths[0]
+	command = 'npm run frappe-build{0}'.format('-minify' if compress else '')
 
-	# build(no_compress, verbose)
+	p = subprocess.Popen(command.split(' '), cwd=frappe_app_path)
+	out, err = p.communicate()
 
 def watch(no_compress):
 	"""watch and rebuild if necessary"""
 
-	# new nodejs file watcher
-	command = 'node --use_strict ../apps/frappe/frappe/build.js --watch'
-	subprocess.call(command.split(' '))
-
-	# setup()
-
-	# import time
-	# compile_less()
-	# build(no_compress=True)
+	setup()
 
-	# while True:
-	# 	compile_less()
-	# 	if files_dirty():
-	# 		build(no_compress=True)
+	frappe_app_path = app_paths[0]
 
-	# 	time.sleep(3)
+	command = 'npm run frappe-watch'.split(' ')
+	p = subprocess.Popen(command, cwd=frappe_app_path)
+	out, err = p.communicate()
 
 def make_asset_dirs(make_copy=False, restore=False):
 	# don't even think of making assets_path absolute - rm -rf ahead.

frappe/commands/utils.py

@@ -13,14 +13,14 @@
 @click.option('--make-copy', is_flag=True, default=False, help='Copy the files instead of symlinking')
 @click.option('--restore', is_flag=True, default=False, help='Copy the files instead of symlinking with force')
 @click.option('--verbose', is_flag=True, default=False, help='Verbose')
-def build(make_copy=False, restore = False, verbose=False):
+@click.option('--minify', is_flag=True, default=False, help='Minify')
+def build(make_copy=False, restore = False, verbose=False, minify=False):
 	"Minify + concatenate JS and CSS files, build translations"
 	import frappe.build
 	import frappe
 	frappe.init('')
-	# don't minify in developer_mode for faster builds
-	no_compress = frappe.local.conf.developer_mode or False
-	frappe.build.bundle(no_compress, make_copy=make_copy, restore = restore, verbose=verbose)
+	compress = minify or (not frappe.conf.developer_mode) or False
+	frappe.build.bundle(compress, make_copy=make_copy, restore = restore, verbose=verbose)
 
 @click.command('watch')
 def watch():

frappe/core/page/desktop/desktop.js

@@ -1,3 +1,4 @@
+
 frappe.provide('frappe.desktop');
 
 frappe.pages['desktop'].on_page_load = function(wrapper) {
@@ -22,6 +23,7 @@ $.extend(frappe.desktop, {
 		}
 
 		this.render();
+
 		this.make_sortable();
 	},
 
@@ -261,24 +263,26 @@ $.extend(frappe.desktop, {
 			return;
 		}
 
-		new Sortable($("#icon-grid").get(0), {
-			animation: 150,
-			onUpdate: function(event) {
-				var new_order = [];
-				$("#icon-grid .case-wrapper").each(function(i, e) {
-					new_order.push($(this).attr("data-name"));
-				});
+		if (window.Sortable) {
+			new Sortable($("#icon-grid").get(0), {
+				onUpdate: function(event) {
+					var new_order = [];
+					$("#icon-grid .case-wrapper").each(function(i, e) {
+						new_order.push($(this).attr("data-name"));
+					});
+
+					frappe.call({
+						method: 'frappe.desk.doctype.desktop_icon.desktop_icon.set_order',
+						args: {
+							'new_order': new_order,
+							'user': frappe.session.user
+						},
+						quiet: true
+					});
+				}
+			});
+		}
 
-				frappe.call({
-					method: 'frappe.desk.doctype.desktop_icon.desktop_icon.set_order',
-					args: {
-						'new_order': new_order,
-						'user': frappe.session.user
-					},
-					quiet: true
-				});
-			}
-		});
 	},
 
 	set_background: function() {

frappe/desk/page/activity/activity.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: See license.txt
-
+import moment from 'moment-timezone';
 frappe.provide("frappe.activity");
 
 frappe.pages['activity'].on_page_load = function(wrapper) {