Allow NPM packages to build for production (#9171)

* add back changes before compiling assets

* new css location and mix manifest

* update papaparse, most vunerabilities attached to it

* update axios and papaparse for security releases

* removing security fixes that still allow npm run production to work

* Update lodash
This commit is contained in:
Joel Pittet 2021-04-05 22:01:11 -07:00 committed by GitHub
parent 49532e1cd6
commit af8509c4d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 21995 additions and 5813 deletions

27707
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -2,12 +2,12 @@
"private": true,
"scripts": {
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "npm run development -- --watch",
"watch-poll": "npm run watch -- --watch-poll",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"engines": {
"node": ">=0.12"
@ -15,12 +15,12 @@
"devDependencies": {
"axios": "^0.20.0",
"babel-preset-latest": "^6.24.1",
"cross-env": "^5.0.5",
"cross-env": "^7.0",
"jquery": "^3.5.1",
"laravel-mix": "2.1",
"laravel-mix": "^5.0.1",
"lodash": "^4.17.20",
"vue": "2.4.4",
"vue-loader": "^13.6.1",
"vue-loader": "^15.9.6",
"vue-template-compiler": "2.4.4"
},
"dependencies": {
@ -34,6 +34,7 @@
"bootstrap-less": "^3.3.8",
"bootstrap-table": "^1.18.0",
"chart.js": "^2.9.4",
"css-loader": "^3.6.0",
"ekko-lightbox": "^5.1.1",
"font-awesome": "^4.7.0",
"icheck": "^1.0.2",
@ -43,12 +44,13 @@
"jquery-ui": "^1.12.1",
"jquery-ui-bundle": "^1.12.1",
"jquery.iframe-transport": "^1.0.0",
"less": "github:less/less.js#efa6eb5306f28a7ef7e235d79ce854b780345591",
"less": "^3.13.1",
"less-loader": "^4.1.0",
"list.js": "^1.5.0",
"papaparse": "^4.3.3",
"phantomjs": "^2.1.7",
"select2": "4.0.13",
"sheetjs": "^2.0.0",
"tableexport.jquery.plugin": "^1.10.20",
"tether": "^1.4.0",
"vue-resource": "^1.3.3"

BIN
public/css/dist/signature-pad.min.css vendored Normal file

Binary file not shown.

View file

@ -1,38 +1,38 @@
{
"/js/build/app.js": "/js/build/app.js?id=1ebbd9e48d7d5754e1c0",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=5d8ce6b758f170008cd6",
"/css/build/app.css": "/css/build/app.css?id=9b6ddbece1a3cfc99036",
"/css/build/overrides.css": "/css/build/overrides.css?id=0a65220cdae6fbb6d913",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a5c05d669800b5f5afa1",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=1d5974e034b61b5795ec",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=cf23e72b9c963c5ab23a",
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=76d0cc15e24e6a03fd2f",
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=6843dc80c6b201c4a7db",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=d3c953fe66305cef3b54",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=97d81897063e94094a2a",
"/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=679ab6aeba9c278a9051",
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=56d008e86c006d37bc23",
"/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=915206c9df022fc5037a",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=2b17e31c820ef66db5a1",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ccdd91178df4c10811e9",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=928bfe8035be1497e83b",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=539f691ddc970f867c49",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=4bf9e22405edb2dc2b76",
"/css/dist/all.css": "/css/dist/all.css?id=fc64989106daf3be016b",
"/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
"/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6843dc80c6b201c4a7db",
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=97d81897063e94094a2a",
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=928bfe8035be1497e83b",
"/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=ccdd91178df4c10811e9",
"/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=679ab6aeba9c278a9051",
"/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=915206c9df022fc5037a",
"/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=539f691ddc970f867c49",
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=cf23e72b9c963c5ab23a",
"/js/build/app.js": "/js/build/app.js?id=8d801ba87a00309caf1d",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=89f2b7816c4e00784b59",
"/css/build/app.css": "/css/build/app.css?id=f534465acd801cafe2a2",
"/css/build/overrides.css": "/css/build/overrides.css?id=c544472168a356889508",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=55133b2153363161b3a3",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=80bea2858aafe2adc79b",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=9fa87f2673f15e56aed6",
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=c5f670074114950c837a",
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=99b3912077021d0bcb22",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=e2fe51f114fd4568b350",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=4d0ca98d55c90250a900",
"/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=b8776482134bff15a82b",
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=1b0196170bca6e28e42f",
"/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=e80057f65c17cff032e0",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=0c1bb7be9618f8f0eebe",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=da122cc1c3e585e888f5",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=8ef6d8a72b7f9719ea0e",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=90bdd43a4b1daa42120f",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=60a2f99ffafb15a85b9c",
"/css/dist/all.css": "/css/dist/all.css?id=cc906fab5ad666abe433",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=99b3912077021d0bcb22",
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=4d0ca98d55c90250a900",
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=8ef6d8a72b7f9719ea0e",
"/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=da122cc1c3e585e888f5",
"/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=b8776482134bff15a82b",
"/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=e80057f65c17cff032e0",
"/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=90bdd43a4b1daa42120f",
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=9fa87f2673f15e56aed6",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
"/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=1e77fde04b3f42432581",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=d729a1e2e97f290cc4e2",
"/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=58d95c93430f2ae33392",
"/js/dist/all.js": "/js/dist/all.js?id=774ae99a6e32515520de"
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=a17945119a381c758e1f",
"/js/dist/all.js": "/js/dist/all.js?id=f0070fb320543ad9496c"
}

View file

@ -11,7 +11,7 @@
@section('content')
<link rel="stylesheet" href="{{ url(mix('css/build/signature-pad.min.css')) }}">
<link rel="stylesheet" href="{{ url(mix('css/dist/signature-pad.min.css')) }}">
<style>
.form-horizontal .control-label, .form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline {

View file

@ -1,5 +1,4 @@
const { mix } = require('laravel-mix');
const mix = require('laravel-mix');
// This generates a file called app.css, which we use
// later on to build all.css
@ -58,7 +57,7 @@ mix
*/
mix
.copy('./resources/assets/css/signature-pad.css', './public/css/dist')
.minify('./public/css/build/signature-pad.css');
.minify('./public/css/dist/signature-pad.css');
// Combine main SnipeIT JS files
mix.js(
@ -94,8 +93,6 @@ mix.less('./resources/assets/less/skins/skin-orange.less', 'css/dist/skins', './
mix.combine(
[
'./node_modules/bootstrap-table/dist/bootstrap-table.css',
'./node_modules/bootstrap-table/dist/extentions/mobile/bootstrap-table-mobile.css',
'./node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.css',
'./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css'
],
'public/css/dist/bootstrap-table.css'
@ -137,14 +134,14 @@ 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/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',
'./resources/assets/js/extensions/jquery.base64.js',
'./node_modules/tableexport.jquery.plugin/tableExport.js',
'./node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.min.js',
'./resources/js/FileSaver.min.js',
'./resources/js/xlsx.core.min.js',
'./resources/assets/js/FileSaver.min.js',
'./node_modules/xlsx/dist/xlsx.core.min.js',
'./node_modules/tableexport.jquery.plugin/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js',
'./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js',
'./node_modules/bootstrap-table/dist/extensions/toolbar/bootstrap-table-toolbar.js'