Merge branch 'release/2.4.49' into craft-webpack

nystudio107 · Nov 20, 2021 · ab1ab7c · ab1ab7c
2 parents 4c26b43 + bd5f2e1
commit ab1ab7c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # nystudio107/craft Change Log
 
+## 2.4.49 - 2021.11.20
+### Added
+* Use `tty: true` for nicer output in terminal from the PHP & webpack Docker containers
+
+### Changed
+* Move Craft Autocomplete to `require-dev`
+* `poll` -> `usePolling`
+
 ## 2.4.48 - 2021.10.20
 ### Changed
 * Updated the `Makefile` to accommodate the change in Docker to using `-` instead of `_` in container names

diff --git a/buildchain/webpack-configs/dev-server.config.js b/buildchain/webpack-configs/dev-server.config.js
@@ -35,7 +35,7 @@ module.exports = (type = 'modern', settings) => {
                 directory: path.resolve(__dirname, settings.contentBase()),
                 publicPath: '/',
                 watch: {
-                    poll: settings.poll() | 0,
+                    usePolling: settings.poll() | 0,
                     ignored: /node_modules/,
                 },
             },

diff --git a/cms/composer.json b/cms/composer.json
@@ -3,7 +3,6 @@
     "craftcms/cms": "^3.6.9",
     "vlucas/phpdotenv": "^3.4.0",
     "yiisoft/yii2-redis": "^2.0.6",
-    "nystudio107/craft-autocomplete": "^1.0.0",
     "nystudio107/craft-imageoptimize": "^1.0.0",
     "nystudio107/craft-fastcgicachebust": "^1.0.0",
     "nystudio107/craft-minify": "^1.2.5",
@@ -15,6 +14,7 @@
     "nystudio107/craft-twigpack": "^1.2.9"
   },
   "require-dev": {
+    "nystudio107/craft-autocomplete": "^1.0.0",
     "yiisoft/yii2-shell": "^2.0.3"
   },
   "autoload": {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -27,6 +27,7 @@ services:
     expose:
       - "9000"
     init: true
+    tty: true
     volumes: &php-volumes
       - cpresources:/var/www/project/cms/web/cpresources:delegated
       - storage:/var/www/project/cms/storage:delegated
@@ -48,6 +49,7 @@ services:
     expose:
       - "9000"
     init: true
+    tty: true
     volumes:
       *php-volumes
   # queue - runs queue jobs via php craft queue/listen
@@ -60,6 +62,7 @@ services:
     env_file:
       *env
     init: true
+    tty: true
     volumes:
       *php-volumes
   # mariadb - database
@@ -98,6 +101,7 @@ services:
     init: true
     ports:
       - "8080:8080"
+    tty: true
     volumes:
       - ./tsconfig.json:/var/www/project/tsconfig.json:cached
       - ./buildchain:/var/www/project/buildchain:cached