Skip to content

Commit

Permalink
Merge branch 'release/2.4.19' into craft-webpack
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Welch committed Jan 27, 2021
2 parents a538b50 + fe3af57 commit e474d84
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 10 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# nystudio107/craft Change Log

## 2.4.19 - 2021.01.27
### Added
* Added Docker bind mount for `compiled_templates` so XDebug can be used with Twig templates

### Changed
* Remove vestigial `HotModuleReplacementPlugin`
* Set `--interactive 0` on console commands in the `composer.json` to force non-interactivity for CI commands

## 2.4.18 - 2021.01.21
### Changed
* Set the minimum platform reqs to PHP `7.2.5`

## 2.4.17 - 2021.01.14
### Changed
* Clean up AMP CSS approach
Expand Down
4 changes: 2 additions & 2 deletions buildchain/nodemon.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"watch": [
"webpack.dev.js",
"webpack-configs/*.js",
"webpack-settings/*.js"
"webpack-configs/",
"webpack-settings/"
],
"exec": "webpack serve --config webpack.dev.js"
}
1 change: 0 additions & 1 deletion buildchain/webpack-configs/dev-server.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ module.exports = (type = 'modern', settings) => {
publicPath: settings.public() + '/',
},
plugins: [
new webpack.HotModuleReplacementPlugin(),
new webpack.EvalSourceMapDevToolPlugin({
test: /\.(m?js|ts)($|\?)/i,
exclude: /\.(pcss|css)($|\?)/i,
Expand Down
10 changes: 5 additions & 5 deletions cms/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
}
},
"config": {
"sort-packages": true,
"optimize-autoloader": true,
"sort-packages": true,
"platform": {
"php": "7.0"
"php": "7.2.5"
}
},
"scripts": {
Expand All @@ -36,9 +36,9 @@
"pre-craft-update": [
],
"post-craft-update": [
"@php craft install/check && php craft clear-caches/all || return 0",
"@php craft install/check && php craft migrate/all || return 0",
"@php craft install/check && php craft project-config/apply || return 0"
"@php craft install/check && php craft clear-caches/all --interactive 0 || return 0",
"@php craft install/check && php craft migrate/all --interactive 0 || return 0",
"@php craft install/check && php craft project-config/apply --interactive 0 || return 0"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "craftcms/craft",
"description": "nystudio107 Craft 3.4 CMS scaffolding project",
"version": "2.4.17",
"version": "2.4.19",
"keywords": [
"craft",
"cms",
Expand Down Expand Up @@ -30,8 +30,9 @@
},
"config": {
"optimize-autoloader": true,
"sort-packages": true,
"platform": {
"php": "7.0"
"php": "7.2.5"
}
},
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ services:
- ./cms:/var/www/project/cms:cached
- ./cms/vendor:/var/www/project/cms/vendor:delegated
- ./cms/storage/logs:/var/www/project/cms/storage/logs:delegated
- ./cms/storage/runtime/compiled_templates:/var/www/project/cms/storage/runtime/compiled_templates:delegated
# php - run php-fpm with xdebug
php_xdebug:
build:
Expand Down

0 comments on commit e474d84

Please sign in to comment.