Merge branch 'release/2.5.6' into craft-vite

CHANGELOG.md

@@ -1,5 +1,11 @@
 # nystudio107/craft Change Log
 
+## 2.5.6 - 2022.03.30
+### Changed
+* Fix `WORKDIR` in `php-prod-craft` container so `make craft` etc. commands work as expected
+* Fix `WORKDIR` in `node-dev-vite` container so `make npm` etc. commands work as expected
+* Fix linting issue with `import.meta.hot`
+
 ## 2.5.5 - 2022.03.30
 ### Changed
 * Remove deprecated `useProjectConfigFile` from `config/general.php`

buildchain/tsconfig.json

@@ -25,6 +25,7 @@
     "strictFunctionTypes": true,
     "strictNullChecks": true,
     "target": "esnext",
+    "types": ["vite/client"],
     "typeRoots": [
       "node_modules/@types"
     ]

docker-config/node-dev-vite/Dockerfile

@@ -5,6 +5,8 @@ WORKDIR /var/www/project/
 COPY ./npm_install.sh .
 RUN chmod a+x npm_install.sh
 
+WORKDIR /var/www/project/buildchain
+
 # Run our webpack build in debug mode
 
 # We'd normally use `npm ci` here, but by using `install`:
@@ -16,8 +18,6 @@ RUN chmod a+x npm_install.sh
 # when working with teams or multiple environments
 CMD export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" \
     && \
-    ./npm_install.sh \
-    && \
-    cd /var/www/project/buildchain/ \
+    /var/www/project/npm_install.sh \
     && \
     npm run dev

docker-config/php-prod-craft/Dockerfile

@@ -57,12 +57,14 @@ RUN chmod a+x run_queue.sh \
 COPY ./composer_install.sh .
 RUN chmod a+x composer_install.sh
 
+WORKDIR /var/www/project/cms
+
 # Run the composer_install.sh script that will do a `composer install`:
 # - If `composer.lock` is missing
 # - If `vendor/` is missing
 # ...then start up php-fpm. The `run_queue.sh` script in the queue container
 # will take care of running any pending migrations and apply any Project Config changes,
 # as well as set permissions via an async CLI process
-CMD ./composer_install.sh \
+CMD /var/www/project/composer_install.sh \
     && \
     php-fpm