Merge branch 'release/1.1.11' into v1

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Twigpack Changelog
 
+## 1.1.11 - 2019-10-15
+### Changed
+* Revert a PR that caused Twigpack to no longer gracefully fall back on locally built assets if the `webpack-dev-server` is not running
+* Add a short timeout to `file_get_contents` to prevent it from taking too long if the file doesn't exist
+
 ## 1.1.10 - 2019-10-03
 ### Changed
 * Changed examples to use `’dev’` for local development (instead of `’local’`)

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-twigpack",
     "description": "Twigpack is a bridge between Twig and webpack, with manifest.json & webpack-dev-server HMR support",
     "type": "craft-plugin",
-    "version": "1.1.10",
+    "version": "1.1.11",
     "keywords": [
         "craftcms",
         "craft-plugin",

src/helpers/Manifest.php

@@ -217,9 +217,6 @@ public static function getModule(array $config, string $moduleName, string $type
     {
         // Get the module entry
         $module = self::getModuleEntry($config, $moduleName, $type, $soft);
-        // Determine whether we should use the devServer for HMR or not
-        $devMode = Craft::$app->getConfig()->getGeneral()->devMode;
-        self::$isHot = ($devMode && $config['useDevServer']);
         if ($module !== null) {
             $prefix = self::$isHot
                 ? $config['devServer']['publicPath']
@@ -527,6 +524,7 @@ function () use ($path, $callback) {
                             'verify_peer_name' => false,
                         ],
                         'http' => [
+                            'timeout' => 5,
                             'ignore_errors' => true,
                             'header' => "User-Agent:Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13\r\n",
                         ],