more js cleanup and consolidation with webpack; removed vendor dir #91

This commit is contained in:
Nabeel Shahzad
2017-12-28 17:29:00 -06:00
parent e65edc5709
commit c8381d99ce
604 changed files with 4500 additions and 79393 deletions

View File

@@ -1,3 +1,7 @@
/**
*
*/
'use strict';
const mix = require('laravel-mix');
@@ -21,17 +25,17 @@ mix.sass('public/assets/admin/vendor/sass/paper-dashboard.scss',
.sourceMaps();
mix.styles([
'public/assets/admin/vendor/bootstrap.css',
'public/assets/admin/vendor/bootstrap-editable.css',
'public/assets/admin/vendor/animate.css',
'public/assets/admin/vendor/pe-icon-7-stroke.css',
'public/assets/admin/vendor/themify-icons.css',
'public/assets/admin/vendor/font-awesome.css',
'public/assets/admin/vendor/leaflet.css',
'public/assets/admin/vendor/paper-dashboard.css',
'public/assets/vendor/select2/dist/css/select2.css',
'public/assets/vendor/icheck/skins/flat/orange.css'
], 'public/assets/admin/css/vendor.min.css').version()
'public/assets/admin/vendor/bootstrap.css',
'public/assets/admin/vendor/bootstrap-editable.css',
'public/assets/admin/vendor/animate.css',
'public/assets/admin/vendor/pe-icon-7-stroke.css',
'public/assets/admin/vendor/themify-icons.css',
'public/assets/admin/vendor/font-awesome.css',
'node_modules/select2/dist/css/select2.css',
'node_modules/leaflet/dist/leaflet.css',
'node_modules/icheck/skins/flat/orange.css',
'public/assets/admin/vendor/paper-dashboard.css',
], 'public/assets/admin/css/vendor.min.css').version()
.sourceMaps();
mix.scripts([
@@ -41,23 +45,14 @@ mix.scripts([
'node_modules/popper.js/dist/umd/popper-utils.js',
'node_modules/select2/dist/js/select2.js',
'node_modules/leaflet/dist/leaflet.js',
'node_modules/icheck/icheck.js',
'node_modules/pjax/pjax.js',
], 'public/assets/admin/js/vendor.js');
/*mix.webpackConfig({
resolve: {
alias: {
jquery: "public/assets/vendor/jquery/dist/jquery.js"
}
}
});*/
/**
* SYSTEM REQUIRED FILES
*/
mix.autoload({
'jquery': ['jQuery', '$'],
});
@@ -65,15 +60,14 @@ mix.autoload({
mix.scripts([
'node_modules/lodash/lodash.js',
'node_modules/jquery/dist/jquery.js',
'public/assets/vendor/bootstrap/bootstrap.min.js',
'node_modules/bootstrap3/dist/js/bootstrap.js',
'node_modules/popper.js/dist/umd/popper.js',
'node_modules/popper.js/dist/umd/popper-utils.js',
'node_modules/select2/dist/js/select2.js',
'node_modules/leaflet/dist/leaflet.js',
'node_modules/pjax/pjax.js',
'public/assets/vendor/leaflet-plugins/leaflet.geodesic.js',
'public/assets/vendor/leaflet-plugins/leaflet.rotatedMarker.js',
'public/assets/vendor/leaflet-plugins/leaflet.rotatedMarker.js',
'node_modules/Leaflet.Geodesic/Leaflet.Geodesic.js',
'node_modules/leaflet-rotatedmarker/leaflet.rotatedMarker.js',
/*'public/assets/frontend/js/plugins/bootstrap-switch.js',
'public/assets/frontend/js/plugins/nouislider.min.js',
'public/assets/frontend/js/plugins/bootstrap-datepicker.js',
@@ -81,9 +75,9 @@ mix.scripts([
], 'public/assets/system/js/vendor.js');
mix.styles([
'node_modules/select2/dist/css/select2.css',
'node_modules/leaflet/dist/leaflet.css',
], 'public/assets/system/css/vendor.css')
'node_modules/select2/dist/css/select2.css',
'node_modules/leaflet/dist/leaflet.css',
], 'public/assets/system/css/vendor.css')
.options({
processCssUrls: false,
compressed: true
@@ -96,7 +90,7 @@ mix.styles([
*/
mix.sass('public/assets/frontend/sass/now-ui-kit.scss',
'public/assets/frontend/css/now-ui-kit.css')
'public/assets/frontend/css/now-ui-kit.css')
.options({
processCssUrls: false,
compressed: true