Merge branch 'release/2.5.4' into craft-vite

nystudio107 · Mar 28, 2022 · c887fa2 · c887fa2
2 parents 6fdf062 + 72cc685
commit c887fa2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.5.4 - 2022.03.28
+### Changed
+* Add `disableProcessTimeout` to the `post-craft-update` Composer scripts, and run Project Config before migrations
+* Add `import.meta.hot.accept()` to accept HMR as per: https://vitejs.dev/guide/api-hmr.html
+
 ## 2.5.3 - 2022.03.26
 ### Changed
 * Ensure permissions on directories Craft needs to write to

diff --git a/cms/composer.json b/cms/composer.json
@@ -30,7 +30,7 @@
     "optimize-autoloader": true,
     "sort-packages": true,
     "platform": {
-      "php":  "7.2.5"
+      "php": "7.2.5"
     }
   },
   "scripts": {
@@ -41,9 +41,10 @@
     "pre-craft-update": [
     ],
     "post-craft-update": [
+      "Composer\\Config::disableProcessTimeout",
       "@php craft install/check && php craft clear-caches/all --interactive=0 || exit 0",
-      "@php craft install/check && php craft migrate/all --interactive=0 || exit 0",
-      "@php craft install/check && php craft project-config/apply --interactive=0 || exit 0"
+      "@php craft install/check && php craft project-config/apply --interactive=0 || exit 0",
+      "@php craft install/check && php craft migrate/all --interactive=0 || exit 0"
     ],
     "post-root-package-install": [
       "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""

diff --git a/src/js/app.ts b/src/js/app.ts
@@ -17,3 +17,10 @@ const main = async () => {
 main().then(() => {
   console.log();
 });
+
+// Accept HMR as per: https://vitejs.dev/guide/api-hmr.html
+if (import.meta.hot) {
+  import.meta.hot.accept(() => {
+    console.log("HMR")
+  });
+}