Merge branch 'release/1.0.5' into v1

nystudio107 · Sep 28, 2018 · 3bfaf66 · 3bfaf66
2 parents 32b1a40 + 0e4ffef
commit 3bfaf66
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Twigpack Changelog
 
+## 1.0.5 - 2018-09-28
+### Changed
+* Check via `empty()` rather than `!== null` when checking the manifest for module entries
+* CSS module loading generates a soft error now, rather than throwing an `NotFoundHttpException`
+
 ## 1.0.4 - 2018-09-28
 ### Added
 * Added `this.onload=null;` to async CSS link tag

diff --git a/composer.json b/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.0.4",
+    "version": "1.0.5",
     "keywords": [
         "craftcms",
         "craft-plugin",

diff --git a/src/helpers/Manifest.php b/src/helpers/Manifest.php
@@ -55,7 +55,7 @@ class Manifest
      */
     public static function getCssModuleTags(array $config, string $moduleName, bool $async)
     {
-        $legacyModule = self::getModule($config, $moduleName, 'legacy');
+        $legacyModule = self::getModule($config, $moduleName, 'legacy', true);
         if ($legacyModule === null) {
             return '';
         }
@@ -151,11 +151,12 @@ public static function getSafariNomoduleFix(): string
      * @param array  $config
      * @param string $moduleName
      * @param string $type
+     * @param bool   $soft
      *
      * @return null|string
      * @throws NotFoundHttpException
      */
-    public static function getModule(array $config, string $moduleName, string $type = 'modern')
+    public static function getModule(array $config, string $moduleName, string $type = 'modern', bool $soft = false)
     {
         $module = null;
         // Determine whether we should use the devServer for HMR or not
@@ -165,12 +166,12 @@ public static function getModule(array $config, string $moduleName, string $type
         $manifest = self::getManifestFile($config, $isHot, $type);
         if ($manifest !== null) {
             // Make sure it exists in the manifest
-            if ($manifest[$moduleName] === null) {
+            if (empty($manifest[$moduleName])) {
                 self::reportError(Craft::t(
                     'twigpack',
                     'Module does not exist in the manifest: {moduleName}',
                     ['moduleName' => $moduleName]
-                ));
+                ), $soft);
 
                 return null;
             }