Merge branch 'release/1.0.30' into v1

nystudio107 · Aug 29, 2022 · 90e0d7b · 90e0d7b
2 parents d9cab6b + 8741ed5
commit 90e0d7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Plugin Vite Changelog
 
+## 1.0.30 - 2022.08.29
+### Fixed
+* Move the call to `parent::init()` in `VitePluginService` down to after `useDevServer` is set based on the check for the `VITE_PLUGIN_DEVSERVER` environment variable ([#244](https://github.com/nystudio107/craft-retour/issues/244))
+
 ## 1.0.29 - 2022.08.29
 ### Fixed
 * Ensure that `useDevServer` is properly set to `false` even if somehow the incoming request is not a CP request ([#244](https://github.com/nystudio107/craft-retour/issues/244))

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "nystudio107/craft-plugin-vite",
   "description": "Plugin Vite is the conduit between Craft CMS plugins and Vite, with manifest.json & HMR support",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "keywords": [
     "craftcms",
     "plugin",

diff --git a/src/services/VitePluginService.php b/src/services/VitePluginService.php
@@ -45,12 +45,12 @@ class VitePluginService extends ViteService
      */
     public function init()
     {
-        parent::init();
         // See if the $pluginDevServerEnvVar env var exists, and if not, don't run off of the dev server
         $useDevServer = (bool)App::env($this->pluginDevServerEnvVar);
         if ($useDevServer === false) {
             $this->useDevServer = false;
         }
+        parent::init();
         // Only bother if this is a CP request
         $request = Craft::$app->getRequest();
         if (!$request->getIsCpRequest()) {