Skip to content

Commit 1f51929

Browse files
committed
upgrade to Laravel Mix 6
1 parent c29de08 commit 1f51929

File tree

9 files changed

+1401
-1690
lines changed

9 files changed

+1401
-1690
lines changed

mix-manifest.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"/public/js/app.js": "/public/js/app.js",
3+
"/public/css/app.css": "/public/css/app.css"
4+
}

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"private": true,
33
"scripts": {
4-
"dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
4+
"dev": "mix",
55
"format": "prettier --write \"**/*.{scss,js,vue}\"",
66
"lint": "eslint --ext .js,.vue resources/js/ --fix",
7-
"prod": "yarn format && cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
8-
"watch": "yarn dev --watch"
7+
"prod": "yarn format && mix --production",
8+
"watch": "mix watch"
99
},
1010
"dependencies": {
11-
"axios": "^0.21.0",
12-
"bootstrap": "^4.5.2",
13-
"chart.js": "^2.9.3",
11+
"axios": "^0.21.1",
12+
"bootstrap": "^4.6.0",
13+
"chart.js": "^2.9.4",
1414
"cross-env": "^7.0.3",
1515
"filepond": "^4.25.1",
1616
"filepond-plugin-file-validate-size": "^2.2.1",
@@ -19,7 +19,7 @@
1919
"filepond-plugin-image-preview": "^4.6.4",
2020
"filepond-plugin-image-validate-size": "^1.2.4",
2121
"jquery": "^3.5.1",
22-
"laravel-mix": "^5.0.7",
22+
"laravel-mix": "^6.0.6",
2323
"lodash": "^4.17.19",
2424
"md5": "^2.3.0",
2525
"moment": "^2.29.1",
@@ -37,6 +37,7 @@
3737
"vue-filepond": "^6.0.2",
3838
"vue-fuse": "^2.2.1",
3939
"vue-infinite-loading": "^2.4.5",
40+
"vue-loader": "^15.9.5",
4041
"vue-multiselect": "^2.1.6",
4142
"vue-router": "^3.4.9",
4243
"vue-template-compiler": "^2.6.11",
@@ -52,6 +53,7 @@
5253
"eslint-plugin-prettier": "^3.3.0",
5354
"eslint-plugin-sort-imports-es6-autofix": "^0.5.0",
5455
"eslint-plugin-vue": "^7.3.0",
56+
"postcss": "^8.1",
5557
"prettier": "^2.2.1",
5658
"webpack-bundle-analyzer": "^4.3.0"
5759
}

public/css/app.css

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/app.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/app.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"/js/app.js": "/js/app.js?id=f89b5ad51f7113df42c2",
3-
"/css/app.css": "/css/app.css?id=773fcc9361a4f8453523",
4-
"/js/app.js.map": "/js/app.js.map?id=7e9c339d4fd45bc95652",
5-
"/css/app.css.map": "/css/app.css.map?id=2491b80a4a260995478c"
2+
"/js/app.js": "/js/app.js?id=b71c4989281ce22d9713",
3+
"/css/app.css": "/css/app.css?id=a49a08395034a6be9488"
64
}

webpack.mix.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ mix.options({
3131
mix.setPublicPath('public')
3232
.setResourceRoot('../')
3333
.js('resources/js/app.js', 'public/js')
34+
.vue()
3435
.sass('resources/sass/app.scss', 'public/css')
3536
.version()
3637
.sourceMaps();

yarn.lock

Lines changed: 1377 additions & 1674 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)