diff --git a/.gitignore b/.gitignore index 32e21df3..01fc19d8 100755 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,10 @@ dist .vagrant npm-debug.* -docs/Oscar_Credentials.md scripts/test_oscarhost.js -scripts/oscarhost/private/ coverage/ e2e_coverage/ -uploads/ app/e2e_tests/screeshots/* -tmp # iOS / Apple # =========== @@ -25,6 +21,7 @@ Oscar_Credentials.* npm-debug.log node_modules/ public/lib/ +public/dist app/tests/coverage/ .bower-*/ .idea/ diff --git a/config/env/production.js b/config/env/production.js index 1091e91e..0f8a72a5 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -28,9 +28,8 @@ module.exports = { domain: process.env.BASE_URL || '.tellform.com' }, assets: { - bower_js: ['public/dist/vendor.min.js'], css: ['public/dist/application.min.css'], js: ['public/dist/application.min.js', 'public/dist/populate_template_cache.js'], - form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js'] + form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js', 'public/dist/form-vendor.min.js'] } }; diff --git a/gruntfile.js b/gruntfile.js index 5fc30add..82f510f9 100755 --- a/gruntfile.js +++ b/gruntfile.js @@ -123,7 +123,7 @@ module.exports = function(grunt) { compress: true }, files: { - 'public/dist/vendor.min.js': bowerArray + 'public/dist/form-vendor.min.js': bowerArray } } },