Skip to content

Commit

Permalink
Update Laravel Mix to v6
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsonge committed Apr 6, 2021
1 parent 7efa335 commit ac86721
Show file tree
Hide file tree
Showing 39 changed files with 10,243 additions and 8,176 deletions.
2 changes: 1 addition & 1 deletion cli/Application/Command/Get/Project.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ protected function processLabels()
}

/**
* Process the project labels.
* Process the project milestones.
*
* @return $this
*
Expand Down
17,341 changes: 10,193 additions & 7,148 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"npm": ">=5.6.0"
},
"scripts": {
"dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"watch": "npm run dev -- --watch",
"prod": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
"dev": "mix",
"watch": "mix watch",
"prod": "mix --production"
},
"dependencies": {
"at.js": "^1.5.4",
Expand All @@ -34,7 +34,7 @@
},
"devDependencies": {
"cross-env": "^6.0.3",
"laravel-mix": "^5.0.0",
"laravel-mix": "^6.0.0",
"resolve-url-loader": "^3.1.0",
"sass": "^1.23.7",
"sass-loader": "^8.0.0",
Expand Down
5 changes: 5 additions & 0 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ mix.setPublicPath('www/media/');
// Configure base path for media assets
mix.setResourceRoot('/media/');

// Documented change for mix v6 upgrade - we are copying files out node_modules so require the watching of node_modules
mix.override((config) => {
delete config.watchOptions;
});

/*
* Copy and build vendor packages
*/
Expand Down
2 changes: 1 addition & 1 deletion www/media/css/jtracker-rtl.css
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.subnav li.pull-right{float:left}ul.trackerPagination li{float:right!important}.example-markdown,.example-rendered{direction:ltr}
.subnav li.pull-right{float:left}ul.trackerPagination li{float:right!important}.example-markdown,.example-rendered{direction:ltr}
2 changes: 1 addition & 1 deletion www/media/css/jtracker.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion www/media/css/markitup/skins/tracker/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion www/media/css/vendor/blueimp-file-upload.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ac86721

Please sign in to comment.