Libs update, laravel-mix upgrade

stanfortonski · Jun 19, 2021 · 4f2f0ab · 4f2f0ab
1 parent 534533d
commit 4f2f0ab
Show file tree

Hide file tree

Showing 9 changed files with 7,467 additions and 9,197 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,34 +1,32 @@
 {
  "private": true,
  "scripts": {
- "dev": "npm run development",
- "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 --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 --no-progress --config=node_modules/laravel-mix/setup/webpack.config.js"
+ "dev": "mix",
+ "watch": "mix watch",
+ "watch-poll": "mix watch -- --watch-options-poll=1000",
+ "hot": "mix watch --hot",
+ "prod": "mix --production"
  },
  "devDependencies": {
- "@babel/core": "^7.14.3",
- "@babel/plugin-proposal-class-properties": "^7.13.0",
- "@babel/preset-env": "^7.14.4",
+ "@babel/core": "^7.14.6",
+ "@babel/plugin-proposal-class-properties": "^7.14.5",
+ "@babel/preset-env": "^7.14.5",
  "@coreui/coreui": "^3.4.0",
  "@fortawesome/fontawesome-free": "^5.15.3",
  "@popperjs/core": "^2.9.2",
  "axios": "^0.19",
  "babel-eslint": "^10.1.0",
  "bs-custom-file-input": "^1.3.4",
  "cross-env": "^7.0.3",
- "eslint": "^7.28.0",
+ "eslint": "^7.29.0",
  "jest": "^26.6.3",
- "laravel-mix": "^5.0.1",
+ "laravel-mix": "^6.0.23",
  "lodash": "^4.17.21",
  "perfect-scrollbar": "^1.5.1",
  "resolve-url-loader": "^3.1.3",
  "sass": "~1.32.13",
  "sass-loader": "^10.2.0",
- "vue-template-compiler": "^2.6.13"
+ "vue-template-compiler": "^2.6.14"
  },
  "dependencies": {
  "tinymce": "^5.8.1"

diff --git a/public/css/admin.css b/public/css/admin.css
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/fontawesome.css b/public/css/fontawesome.css
diff --git a/public/js/admin.js b/public/js/admin.js
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
- "/js/admin.js": "/js/admin.js",
  "/js/app.js": "/js/app.js",
- "/css/admin.css": "/css/admin.css",
+ "/js/admin.js": "/js/admin.js",
+ "/css/fontawesome.css": "/css/fontawesome.css",
  "/css/app.css": "/css/app.css",
- "/css/fontawesome.css": "/css/fontawesome.css"
+ "/css/admin.css": "/css/admin.css"
 }