From 957599ae01687d6b3d02a3c34fdbe2ac6bd920f9 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 16 Feb 2017 18:51:26 -0200 Subject: [#907] Bundles login static files separately Due to conflicts with public and protected urls, login and interstitial files have to be on a different public url from inbox and resources that require login. Therefore, here, we delegate that logic to webpack. Now we have a '/public' url and a '/assets' url for those static assets. --- web-ui/config/copy-webpack.js | 91 ------------------------------- web-ui/config/protected-assets-webpack.js | 25 +++++++++ web-ui/config/public-assets-webpack.js | 10 ++++ 3 files changed, 35 insertions(+), 91 deletions(-) delete mode 100644 web-ui/config/copy-webpack.js create mode 100644 web-ui/config/protected-assets-webpack.js create mode 100644 web-ui/config/public-assets-webpack.js (limited to 'web-ui/config') diff --git a/web-ui/config/copy-webpack.js b/web-ui/config/copy-webpack.js deleted file mode 100644 index 7e56d760..00000000 --- a/web-ui/config/copy-webpack.js +++ /dev/null @@ -1,91 +0,0 @@ -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: 'src/backup_account/', from: 'backup_account.html' }, - { context: 'src/login/', from: '*.html' }, - { context: 'src/login/', from: '*.css' }, - { context: 'src/interstitial/', from: '*' }, - { context: 'app/', from: 'css/*' }, - { context: 'app/', from: 'fonts/*' }, - { context: 'app/', from: 'locales/**/*' }, - { context: 'app/', from: 'images/**/*' }, - { 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/protected-assets-webpack.js b/web-ui/config/protected-assets-webpack.js new file mode 100644 index 00000000..85654cf0 --- /dev/null +++ b/web-ui/config/protected-assets-webpack.js @@ -0,0 +1,25 @@ +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: 'src/backup_account/', from: 'backup_account.html' }, + { context: 'app/bower_components/font-awesome/', from: 'fonts/*' }, + { context: 'app/bower_components/font-awesome/', from: 'css/font-awesome.min.css', to: 'css' }, + { context: 'app/bower_components/jquery-file-upload/', from: 'css/jquery.fileupload.css', to: 'css' }, + { context: 'app/bower_components/modernizr/', from: 'modernizr.js' }, + { context: 'app/bower_components/lodash/dist/', from: 'lodash.min.js' }, + { context: 'app/bower_components/jquery/dist/', from: 'jquery.min.js' }, + { context: 'app/bower_components/jquery-ui/', from: 'jquery-ui.min.js' }, + { context: 'app/bower_components/jquery-file-upload/js/', from: 'jquery.fileupload.js' }, + { context: 'app/bower_components/handlebars/', from: 'handlebars.min.js' }, + { context: 'app/bower_components/typeahead.js/dist/', from: 'typeahead.bundle.min.js' }, + { context: 'app/bower_components/iframe-resizer/js/', from: 'iframeResizer.min.js' }, + { context: 'app/bower_components/iframe-resizer/js/', from: 'iframeResizer.contentWindow.min.js' }, + { context: 'app/bower_components/foundation/js/', from: 'foundation.js' }, + { context: 'app/bower_components/foundation/js/foundation/', from: 'foundation.reveal.js' }, + { context: 'app/bower_components/foundation/js/foundation/', from: 'foundation.offcanvas.js' }, + { context: 'app/js/foundation/', from: 'initialize_foundation.js' } +]) diff --git a/web-ui/config/public-assets-webpack.js b/web-ui/config/public-assets-webpack.js new file mode 100644 index 00000000..28dff566 --- /dev/null +++ b/web-ui/config/public-assets-webpack.js @@ -0,0 +1,10 @@ +var CopyWebpackPlugin = require('copy-webpack-plugin'); + +module.exports = new CopyWebpackPlugin([ + { context: 'src/login/', from: '*.html' }, + { context: 'src/login/', from: '*.css' }, + { context: 'src/interstitial/', from: '*' }, + { context: 'app/', from: 'fonts/*' }, + { context: 'app/', from: 'locales/**/*' }, + { context: 'app/', from: 'images/**/*' } +]); -- cgit v1.2.3