4 files changed, 114 insertions, 105 deletions
diff --git a/web-ui/config/alias-webpack.js b/web-ui/config/alias-webpack.js
new file mode 100644
index 00000000..f4ea1b63
--- /dev/null
+++ b/web-ui/config/alias-webpack.js
@@ -0,0 +1,28 @@
+var path = require('path');
+
+module.exports = {
+  'DOMPurify': 'dompurify',
+  'i18nextXHRBackend': 'i18next-xhr-backend',
+  'i18nextBrowserLanguageDetector': 'i18next-browser-languagedetector',
+  'flight': path.join(__dirname, '../app/bower_components/flight'),
+  'found': path.join(__dirname, '../app/bower_components/foundation'),
+  'js': path.join(__dirname, '../app/js'),
+  'mail_list': path.join(__dirname, '../app/js/mail_list'),
+  'page': path.join(__dirname, '../app/js/page'),
+  'feedback': path.join(__dirname, '../app/js/feedback'),
+  'hbs': path.join(__dirname, '../app/js/generated/hbs'),
+  'helpers': path.join(__dirname, '../app/js/helpers'),
+  'lib': path.join(__dirname, '../app/js/lib'),
+  'views': path.join(__dirname, '../app/js/views'),
+  'tags': path.join(__dirname, '../app/js/tags'),
+  'mail_list_actions': path.join(__dirname, '../app/js/mail_list_actions'),
+  'user_alerts': path.join(__dirname, '../app/js/user_alerts'),
+  'mail_view': path.join(__dirname, '../app/js/mail_view'),
+  'dispatchers': path.join(__dirname, '../app/js/dispatchers'),
+  'services': path.join(__dirname, '../app/js/services'),
+  'mixins': path.join(__dirname, '../app/js/mixins'),
+  'search': path.join(__dirname, '../app/js/search'),
+  'foundation': path.join(__dirname, '../app/js/foundation'),
+  'features': path.join(__dirname, '../app/js/features/features'),
+  'user_settings': path.join(__dirname, '../app/js/user_settings')
+}
diff --git a/web-ui/config/buildoptions.js b/web-ui/config/buildoptions.js
deleted file mode 100644
index 63c91653..00000000
--- a/web-ui/config/buildoptions.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014 ThoughtWorks, Inc.
-   *
- * Pixelated is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pixelated is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
- */
-
-({
-  baseUrl: '../app',
-  wrap: true,
-  almond: true,
-  optimize: 'none',
-  mainConfigFile: '../app/js/main.js',
-  out: '../.tmp/app.concatenated.js',
-  include: ['js/main'],
-  name: 'bower_components/almond/almond'
-})
diff --git a/web-ui/config/copy-webpack.js b/web-ui/config/copy-webpack.js
new file mode 100644
index 00000000..79a5de83
--- /dev/null
+++ b/web-ui/config/copy-webpack.js
@@ -0,0 +1,86 @@
+var CopyWebpackPlugin = require('copy-webpack-plugin');
+
+module.exports = new CopyWebpackPlugin([
+  { context: 'app/', from: '404.html' },
+  { context: 'app/', from: 'index.html' },
+  { context: 'app/', from: 'sandbox.html' },
+  { context: 'app/', from: 'css/*' },
+  { context: 'app/', from: 'fonts/*' },
+  { context: 'app/', from: 'locales/**/*' },
+  { context: 'app/', from: 'bower_components/font-awesome/fonts/*' },
+  {
+    context: 'app/',
+    from: 'bower_components/font-awesome/css/font-awesome.min.css',
+    to: 'bower_components/font-awesome/css'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/jquery-file-upload/css/jquery.fileupload.css',
+    to: 'bower_components/jquery-file-upload/css'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/modernizr/modernizr.js',
+    to: 'bower_components/modernizr'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/lodash/dist/lodash.min.js',
+    to: 'bower_components/lodash/dist'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/jquery/dist/jquery.min.js',
+    to: 'bower_components/jquery/dist'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/jquery-ui/jquery-ui.min.js',
+    to: 'bower_components/jquery-ui'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/jquery-file-upload/js/jquery.fileupload.js',
+    to: 'bower_components/jquery-file-upload/js'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/handlebars/handlebars.min.js',
+    to: 'bower_components/handlebars'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/typeahead.js/dist/typeahead.bundle.min.js',
+    to: 'bower_components/typeahead.js/dist'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/iframe-resizer/js/iframeResizer.min.js',
+    to: 'bower_components/iframe-resizer/js'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/iframe-resizer/js/iframeResizer.contentWindow.min.js',
+    to: 'bower_components/iframe-resizer/js'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/foundation/js/foundation.js',
+    to: 'bower_components/foundation/js'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/foundation/js/foundation/foundation.reveal.js',
+    to: 'bower_components/foundation/js/foundation'
+  },
+  {
+    context: 'app/',
+    from: 'bower_components/foundation/js/foundation/foundation.offcanvas.js',
+    to: 'bower_components/foundation/js/foundation'
+  },
+  {
+    context: 'app/',
+    from: 'js/foundation/initialize_foundation.js',
+    to: 'js/foundation'
+  }
+])
diff --git a/web-ui/config/package.sh b/web-ui/config/package.sh
deleted file mode 100644
index 165eeff3..00000000
--- a/web-ui/config/package.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pixelated is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-
-# prepare files for .deb package
-
-set -e
-
-export PIXELATED_BUILD='package'
-
-mkdir -p dist
-
-# initial npm tasks
-./go clean
-./go compass
-./go handlebars
-./go imagemin
-./go minify_html
-./go minify_sandbox
-./go add_git_version
-./go buildmain
-
-
-# copy files
-cd app
-cp --parents \
-404.html \
-fonts/* \
-locales/**/* \
-bower_components/font-awesome/css/font-awesome.min.css \
-bower_components/jquery-file-upload/css/jquery.fileupload.css \
-bower_components/font-awesome/fonts/* \
-../dist
-cd -
-
-# concat js files and minify for app.min.js
-cat \
-app/bower_components/modernizr/modernizr.js \
-app/bower_components/lodash/dist/lodash.js \
-app/bower_components/jquery/dist/jquery.js \
-app/bower_components/jquery-ui/jquery-ui.js \
-app/bower_components/jquery-file-upload/js/jquery.fileupload.js \
-app/js/lib/highlightRegex.js \
-app/bower_components/handlebars/handlebars.js \
-app/bower_components/typeahead.js/dist/typeahead.bundle.js \
-app/bower_components/foundation/js/foundation.js \
-app/bower_components/foundation/js/foundation/foundation.reveal.js \
-app/bower_components/foundation/js/foundation/foundation.offcanvas.js \
-app/js/foundation/initialize_foundation.js \
-app/bower_components/iframe-resizer/js/iframeResizer.js \
-.tmp/app.concatenated.js > dist/app.js
-node_modules/.bin/minify dist/app.js > dist/app.min.js
-rm dist/app.js
-
-if [ ! -s dist/app.min.js ]
-then
-echo "Minification failed!"
-exit 1;
-fi
-
-# concat js files and minify for sandbox.min.js
-cat \
-app/js/sandbox.js \
-app/bower_components/iframe-resizer/js/iframeResizer.contentWindow.js > dist/sandbox.js
-node_modules/.bin/minify dist/sandbox.js > dist/sandbox.min.js
-rm dist/sandbox.js