mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-16 18:44:10 -08:00
Merge pull request #12956 from uberbrady/upgrade_node_and_packages_for_v7
Updated Node version, and various packages to more recent
This commit is contained in:
commit
da8b41b12a
23177
package-lock.json
generated
23177
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -39,15 +39,15 @@
|
|||
"css-loader": "^4.0.0",
|
||||
"ekko-lightbox": "^5.1.1",
|
||||
"imagemin": "^8.0.1",
|
||||
"jquery-form-validator": "^2.3.79",
|
||||
"jquery-slimscroll": "^1.3.8",
|
||||
"jquery-ui": "^1.13.2",
|
||||
"jquery-ui-bundle": "^1.12.1",
|
||||
"jquery.iframe-transport": "^1.0.0",
|
||||
"jspdf-autotable": "^3.5.24",
|
||||
"less": "^4.1.2",
|
||||
"less-loader": "^5.0",
|
||||
"less-loader": "^6.0",
|
||||
"list.js": "^1.5.0",
|
||||
"morris.js": "github:morrisjs/morris.js",
|
||||
"papaparse": "^4.3.3",
|
||||
"select2": "4.0.13",
|
||||
"sheetjs": "^2.0.0",
|
||||
|
|
|
@ -61,77 +61,62 @@ mix
|
|||
// Convert the skins to CSS
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-blue.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-blue.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-red.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-red.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-contrast.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-contrast.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-green.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-green.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-green-dark.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-green-light.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-black.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-black.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-black-dark.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-black-light.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-red-dark.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-red-light.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-purple.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-purple.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-purple-dark.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-purple-light.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-yellow.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-yellow.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-yellow-dark.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-yellow-light.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-blue-dark.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-blue-light.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-orange-dark.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-orange-light.css"
|
||||
);
|
||||
mix.less(
|
||||
"./resources/assets/less/skins/skin-orange.less",
|
||||
"css/dist/skins",
|
||||
"./public/css/dist/skins/skin-orange.css"
|
||||
);
|
||||
|
||||
|
@ -168,7 +153,7 @@ mix.combine(
|
|||
"./resources/assets/js/extensions/pGenerator.jquery.js",
|
||||
"./node_modules/chart.js/dist/Chart.js",
|
||||
"./resources/assets/js/signature_pad.js",
|
||||
"./node_modules/jquery-form-validator/form-validator/jquery.form-validator.js", //problem?
|
||||
//"./node_modules/jquery-form-validator/form-validator/jquery.form-validator.js", //problem?
|
||||
"./node_modules/list.js/dist/list.js",
|
||||
],
|
||||
"public/js/build/vendor.js" // this file seems OK!
|
||||
|
|
Loading…
Reference in a new issue