Merge branch 'release/1.2.5' into v1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Twigpack Changelog
 
+## 1.2.5 - 2020-08-14
+### Changed
+* Fixed a regression from the `styles.js` error suppression that would cause it to throw an exception if you attempted to load it
+
 ## 1.2.4 - 2020-08-12
 ### Changed
 * Suppress errors for `styles.js` modules (which is a work-around to a webpack bug)

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.2.4",
+    "version": "1.2.5",
     "keywords": [
         "craftcms",
         "craft-plugin",

src/helpers/Manifest.php

@@ -344,12 +344,15 @@ public static function getModuleEntry(
         $manifest = self::getManifestFile($config, $type);
         if ($manifest !== null) {
             // Make sure it exists in the manifest
-            if (empty($manifest[$moduleName]) && !in_array($moduleName, self::SUPPRESS_ERRORS_FOR_MODULES)) {
-                self::reportError(Craft::t(
-                    'twigpack',
-                    'Module does not exist in the manifest: {moduleName}',
-                    ['moduleName' => $moduleName]
-                ), $soft);
+            if (empty($manifest[$moduleName])) {
+                // Don't report errors for any files in SUPPRESS_ERRORS_FOR_MODULES
+                if (!in_array($moduleName, self::SUPPRESS_ERRORS_FOR_MODULES)) {
+                    self::reportError(Craft::t(
+                        'twigpack',
+                        'Module does not exist in the manifest: {moduleName}',
+                        ['moduleName' => $moduleName]
+                    ), $soft);
+                }
 
                 return null;
             }