Merge branch 'release/2.2.10' into craft-webpack

nystudio107 · May 20, 2020 · e6d37a6 · e6d37a6
2 parents a1ece82 + 59c634d
commit e6d37a6
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # nystudio107/craft Change Log
 
+## 2.2.10 - 2020.05.20
+### Added
+* Added baked-in support for xdebug
+
+### Changed
+* Always do a `composer install` & `npm install` when starting up via `docker-compose up`
+
+### Fixed
+* Fixed tab handler not adding the class to the `<body>`
+
 ## 2.2.9 - 2020.04.14
 ### Added
 * Added support for repo.repman.io Packagist proxy global CDN 

diff --git a/README.md b/README.md
@@ -80,6 +80,28 @@ rm docker-config/webpack-dev-craft/package-lock.json
 docker-compose up
 ```
 
+To use Xdebug with VSCode install the [PHP Debug extension](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-debug ) and use the following configuration:
+```json
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for Xdebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9001,
+            "log": true,
+            "externalConsole": false,
+            "pathMappings": {
+                "/var/www/project/cms": "${workspaceRoot}/cms"
+            },
+            "ignore": ["**/vendor/**/*.php"]
+        }
+    ]
+}
+```
+
+
 Below is the entire intact, unmodified `README.md` from Pixel & Tonic's [craftcms/craft](https://github.com/craftcms/craft):
 
 .....

diff --git a/cms/example.env b/cms/example.env
@@ -64,3 +64,6 @@ GA_TRACKING_ID=
 
 # FastCGI Cache Bust settings
 FAST_CGI_CACHE_PATH=
+
+# Xdebug Settings
+DBGP_IDEKEY=phpstorm
diff --git a/cms/templates/_boilerplate/_partials/tab-handler.twig b/cms/templates/_boilerplate/_partials/tab-handler.twig
@@ -10,15 +10,15 @@
 <script>
     function handleFirstTab(e) {
         if (e.keyCode === 9) {
-            document.documentElement.classList.add('user-is-tabbing');
+            document.body.classList.add('user-is-tabbing');
 
             window.removeEventListener('keydown', handleFirstTab);
             window.addEventListener('mousedown', handleMouseDownOnce);
         }
     }
 
     function handleMouseDownOnce() {
-        document.documentElement.classList.remove('user-is-tabbing');
+        document.body.classList.remove('user-is-tabbing');
 
         window.removeEventListener('mousedown', handleMouseDownOnce);
         window.addEventListener('keydown', handleFirstTab);

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.2.9",
+  "version": "2.2.10",
   "keywords": [
     "craft",
     "cms",

diff --git a/docker-config/php-dev-base/Dockerfile b/docker-config/php-dev-base/Dockerfile
@@ -66,5 +66,8 @@ RUN echo "upload_max_filesize = 10M" > /usr/local/etc/php/php.ini && \
     echo "opcache.revalidate_freq = 0" >> /usr/local/etc/php/php.ini && \
     echo "opcache.validate_timestamps = 1" >> /usr/local/etc/php/php.ini
 
+# Copy the `xdebug.ini` file into place for xdebug
+COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
+
 # Copy the `zzz-docker.conf` file into place for php-fpm
 COPY ./zzz-docker.conf /usr/local/etc/php-fpm.d/zzz-docker.conf
diff --git a/docker-config/php-dev-base/xdebug.ini b/docker-config/php-dev-base/xdebug.ini
@@ -0,0 +1,7 @@
+xdebug.default_enable=1
+xdebug.remote_enable=1
+xdebug.remote_port=9001
+xdebug.remote_handler=dbgp
+xdebug.remote_connect_back=0
+xdebug.remote_host=host.docker.internal
+xdebug.remote_autostart=1
diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile
@@ -30,18 +30,16 @@ RUN mkdir -p /var/www/project/cms/web/cpresources && \
 
 WORKDIR /var/www/project/cms
 
+# Force permissions, update Craft, and start php-fpm
+
 # Do a `composer install` without running any Composer scripts
 # - If `composer.lock` is present, it will install what is in the lock file
 # - If `composer.lock` is missing, it will update to the latest dependencies
 #   and create the `composer.lock` file
-# Force permissions, update Craft, and start php-fpm
-CMD if [ ! -f "./composer.lock" ]; then \
-        composer install --no-scripts --optimize-autoloader --no-interaction; \
-    fi \
-    && \
-    if [ ! -d ./vendor -o ! "$(ls -A ./vendor)" ]; then \
-        composer install --no-scripts --optimize-autoloader --no-interaction; \
-    fi \
+# This automatic running adds to the startup overhead of `docker-compose up`
+# but saves far more time in not having to deal with out of sync versions
+# when working with teams or multiple environments
+CMD composer install --no-scripts --optimize-autoloader --no-interaction \
     && \
     chown -R www-data:www-data /var/www/project/cms/vendor \
     && \

diff --git a/docker-config/webpack-dev-craft/Dockerfile b/docker-config/webpack-dev-craft/Dockerfile
@@ -2,17 +2,15 @@ FROM nystudio107/webpack-dev-base
 
 WORKDIR /var/www/project/docker-config/webpack-dev-craft/
 
+# Run our webpack build in debug mode
+
 # We'd normally use `npm ci` here, but by using `install`:
 # - If `package-lock.json` is present, it will install what is in the lock file
 # - If `package-lock.json` is missing, it will update to the latest dependencies
 #   and create the `package-lock-json` file
-# Run our webpack build in debug mode
-CMD if [ ! -f  "./package-lock.json" ]; then \
-        npm install; \
-    fi \
-    && \
-    if [ ! -d  "./node_modules" -o ! "$(ls -A ./node_modules)" ]; then \
-        npm install; \
-    fi \
+# This automatic running adds to the startup overhead of `docker-compose up`
+# but saves far more time in not having to deal with out of sync versions
+# when working with teams or multiple environments
+CMD npm install \
     && \
     npm run debug