diff options
| -rw-r--r-- | web-ui/app/index.html | 4 | ||||
| -rw-r--r-- | web-ui/app/js/index.js | 4 | ||||
| -rw-r--r-- | web-ui/package.json | 3 | ||||
| -rw-r--r-- | web-ui/webpack.config.js | 72 | ||||
| -rw-r--r-- | web-ui/webpack.production.config.js | 22 |
5 files changed, 33 insertions, 72 deletions
diff --git a/web-ui/app/index.html b/web-ui/app/index.html index 9449dfb3..4cdcb248 100644 --- a/web-ui/app/index.html +++ b/web-ui/app/index.html @@ -101,6 +101,10 @@ <script src="assets/bower_components/handlebars/handlebars.min.js"></script> <script src="assets/bower_components/typeahead.js/dist/typeahead.bundle.min.js"></script> <script src="assets/bower_components/iframe-resizer/js/iframeResizer.min.js"></script> +<script src="assets/bower_components/foundation/js/foundation.js" ></script> +<script src="assets/bower_components/foundation/js/foundation/foundation.reveal.js" ></script> +<script src="assets/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script> +<script src="assets/js/foundation/initialize_foundation.js"></script> <script src="assets/app.min.js"></script> <!--usemin_end--> diff --git a/web-ui/app/js/index.js b/web-ui/app/js/index.js index 724643c5..2f06e2b8 100644 --- a/web-ui/app/js/index.js +++ b/web-ui/app/js/index.js @@ -1,7 +1,3 @@ -import 'foundation-sites'; -import 'foundation-sites/js/foundation.reveal.js'; -import 'foundation-sites/js/foundation.offcanvas.js'; -import 'js/foundation/initialize_foundation'; import 'js/lib/highlightRegex'; import 'js/monkey_patching/all'; diff --git a/web-ui/package.json b/web-ui/package.json index de6759fb..de80bded 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -10,10 +10,9 @@ "babel-loader": "^6.2.10", "babel-preset-es2015": "^6.18.0", "bower": "1.7.9", + "copy-webpack-plugin": "^4.0.1", "dompurify": "^0.8.4", - "flightjs": "1.3.0", "font-awesome": "^4.7.0", - "foundation-sites": "^6.3.0", "handlebars": "^4.0.5", "he": "^1.1.0", "html-minifier": "2.1.6", diff --git a/web-ui/webpack.config.js b/web-ui/webpack.config.js index c4a54b4a..eb64aab8 100644 --- a/web-ui/webpack.config.js +++ b/web-ui/webpack.config.js @@ -8,18 +8,19 @@ module.exports = { output: { path: path.join(__dirname, '/app/'), filename: 'app.min.js', - publicPath: '/assets/js/' + publicPath: '/assets/' }, resolve: { alias: { - 'js': path.join(__dirname, '/app/js'), + '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'), - 'DOMPurify': 'dompurify', - 'i18nextXHRBackend': 'i18next-xhr-backend', - 'i18nextBrowserLanguageDetector': 'i18next-browser-languagedetector', 'hbs': path.join(__dirname, '/app/js/generated/hbs'), 'helpers': path.join(__dirname, '/app/js/helpers'), 'lib': path.join(__dirname, '/app/js/lib'), @@ -47,64 +48,5 @@ module.exports = { query: { presets: ['es2015']} } ] - }, - plugins: [ - new CopyWebpackPlugin([ - { context: 'app/', from: '404.html' }, - { context: 'app/', from: 'index.html' }, - { 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' - } - ]) - ] + } } diff --git a/web-ui/webpack.production.config.js b/web-ui/webpack.production.config.js index 36eb9396..b8531080 100644 --- a/web-ui/webpack.production.config.js +++ b/web-ui/webpack.production.config.js @@ -8,7 +8,7 @@ module.exports = { output: { path: path.join(__dirname, '/dist/'), filename: 'app.min.js', - publicPath: '/assets/js/' + publicPath: '/assets/' }, resolve: { alias: { @@ -105,6 +105,26 @@ module.exports = { context: 'app/', from: 'bower_components/iframe-resizer/js/iframeResizer.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' + }, + { + context: 'app/', + from: 'bower_components/foundation/js/foundation/foundation.offcanvas.js', + to: 'bower_components/foundation/js' + }, + { + context: 'app/', + from: 'js/foundation/initialize_foundation.js', + to: 'js/foundation' } ]) ] |