DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/webpack.mix.js

130 lines
4.1 KiB
JavaScript
Raw Normal View History

Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
const { mix } = require("laravel-mix");
Removed poop class, added comment to webpack file
2017-06-06 01:44:17 -07:00
// This generates a file called app.css, which we use
// later on to build all.css
More npm/css/js updates
2017-05-31 12:34:05 -07:00
mix
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
.options({
processCssUrls: false,
processFontUrls: true,
clearConsole: false
})
Moved js/css/less out of resources/assets Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
.less("./resources/less/AdminLTE.less", "css/build")
.less("./resources/less/app.less", "css/build")
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
.styles(
[
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
"./node_modules/bootstrap/dist/css/bootstrap.css",
"./node_modules/font-awesome/css/font-awesome.css",
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
"./node_modules/select2/dist/css/select2.css",
Fixed select box rendering issue. (#6260) Changed order of CSS files for combining
2018-09-28 15:18:15 -07:00
"./public/css/build/AdminLTE.css",
Fixed tooltips and iCheck (#6303) * Fixed missing oauth tables during setup. * Fixed duplicate style tag This was causing webpack issues. * Deleted erroneously created directory * Removed duplicate imports * Fixed tooltips, iCheck audit page https://github.com/snipe/snipe-it/pull/6285#issuecomment-427235280 * Merge remote-tracking branch 'origin/#6285-Fixes' into #6285-Fixes Fixed Manifest file
2018-10-05 07:41:04 -07:00
"./node_modules/jquery-ui-dist/jquery-ui.css",
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
"./node_modules/admin-lte/plugins/iCheck/minimal/blue.css",
"./node_modules/icheck/skins/minimal/minimal.css",
"./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css",
"./node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
Fixed: Missing CSS file in basic.blade.php (#6264) * Fixed missing CSS file in basic.blade.php * Added * Changed stylesheet import for authorize.blade.php
2018-09-29 14:15:25 -07:00
"./node_modules/blueimp-file-upload/css/jquery.fileupload.css",
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
"./node_modules/blueimp-file-upload/css/jquery.fileupload-ui.css",
"./node_modules/ekko-lightbox/dist/ekko-lightbox.css",
"./public/css/build/app.css"
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
],
"./public/css/all.css"
);
LDAP fixes (#6533) * Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder * php 7.3 collect() fix (undefined variable) * Fix travis ci * Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder * php 7.3 collect() fix (undefined variable) * change LDAP implementation from model to (singleton) service * Re-apply check for content in ldap_server variable before parsing * Update LDAP implementation * Switch iCheck to minimal as referenced in js * Don't init on load but on first access via init (returns ldap enabled status) * Re-Enable notifications * Re-add missing test target php versions * Only init() once (singleton class, so ldap variable is already set)
2019-01-10 13:20:43 -08:00
mix.copy(["./node_modules/icheck/skins/minimal/blue.png",
"./node_modules/icheck/skins/minimal/[email protected]"], "./public/css");
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
/**
* Copy, minify and version skins
*/
Moved js/css/less out of resources/assets Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
mix.copyDirectory("./resources/css/skins", "./public/css/skins");
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
mix
.minify([
"./public/css/skins/skin-green-dark.css",
"./public/css/skins/skin-orange-dark.css",
"./public/css/skins/skin-red-dark.css"
])
.version();
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
/**
* Copy, minify and version signature-pad.css
*/
mix
Moved js/css/less out of resources/assets Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
.copy("./resources/css/signature-pad.css", "./public/css")
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
.minify("./public/css/signature-pad.css")
.version();
Cleaned up JS Removed unnecessary JS files Moved JS to app & vendor, so neither file is so large, plus they can be downloaded concurrently.
2018-09-28 09:02:15 -07:00
// Combine main SnipeIT JS files
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
mix.js(
[
Moved js/css/less out of resources/assets Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
"./resources/js/vue.js",
"./resources/js/snipeit.js", //this is the actual Snipe-IT JS
"./resources/js/snipeit_modals.js"
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
],
"./public/js/app.js"
);
Fixing laravel mix() fuckery, hopefully for the last time
2017-10-25 18:13:03 -07:00
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
/**
Cleaned up JS Removed unnecessary JS files Moved JS to app & vendor, so neither file is so large, plus they can be downloaded concurrently.
2018-09-28 09:02:15 -07:00
* Combine JS
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
*/
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
mix
.combine(
[
"./node_modules/admin-lte/dist/js/adminlte.min.js",
Fixed: Tooltips (#6309) * Fixed missing oauth tables during setup. * Fixed missing tooltips Updated spelling in bootstrap-table.blade.php to use bootstrap data element. Using custom jquery-ui without tooltips to fix conflict issue. * Removed custom jQuery ui file added fix in bootstrap.js file
2018-10-09 15:20:27 -07:00
"./node_modules/tether/dist/js/tether.js",
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
"./node_modules/jquery-slimscroll/jquery.slimscroll.js",
"./node_modules/jquery.iframe-transport/jquery.iframe-transport.js",
"./node_modules/blueimp-file-upload/js/jquery.fileupload.js",
"./node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js",
"./node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
"./node_modules/ekko-lightbox/dist/ekko-lightbox.js",
"./node_modules/icheck/icheck.js",
Moved js/css/less out of resources/assets Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
"./resources/js/extensions/pGenerator.jquery.js",
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
"./node_modules/chart.js/dist/Chart.js",
Moved js/css/less out of resources/assets Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
"./resources/js/signature_pad.js",
Added jquery-form-validator
2018-10-04 23:50:57 -07:00
"./node_modules/jquery-form-validator/form-validator/jquery.form-validator.js"
Fixed Tooltips and Rounded corners from previous cleanup (#6285) * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
],
"public/js/vendor.js"
)
.version();
More npm/css/js updates
2017-05-31 12:34:05 -07:00
Added #5956 - Moved bootstrap-tables to npm (#6139) Created single bootstrap-tables js and css file.
2018-08-28 13:10:27 -07:00
/**
* Combine bootstrap table js
*/
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
mix
.combine(
[
"node_modules/bootstrap-table/dist/bootstrap-table.js",
"node_modules/bootstrap-table/dist/extentions/mobile/bootstrap-table-mobile.js",
"node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js",
"node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js",
Moved js/css/less out of resources/assets Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
"resources/js/extensions/jquery.base64.js",
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
"node_modules/tableexport.jquery.plugin/tableExport.js",
"node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.min.js",
"node_modules/tableexport.jquery.plugin/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js"
],
"public/js/dist/bootstrap-table.js"
)
.version();
Added #5956 - Moved bootstrap-tables to npm (#6139) Created single bootstrap-tables js and css file.
2018-08-28 13:10:27 -07:00
/**
* Combine bootstrap table js Simple View
*/
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
mix
.combine(
[
"node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js",
"node_modules/bootstrap-table/dist/extensions/toolbar/bootstrap-table-toolbar.js"
],
"public/js/dist/bootstrap-table-simple-view.js"
)
.version();
Added #5956 - Moved bootstrap-tables to npm (#6139) Created single bootstrap-tables js and css file.
2018-08-28 13:10:27 -07:00
/**
* Combine bootstrap table css
*/
Added: #6246 - CSS Cleanup (#6247) * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
mix
.combine(
[
"node_modules/bootstrap-table/dist/bootstrap-table.css",
"node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css"
],
"public/css/dist/bootstrap-table.css"
)
.version();
Reference in a new issue Copy permalink