Fix vendor assets not found in production mode

Author: lcharette

CHANGELOG.md

@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     - Added `JsonException` if `sprinkles.json` doesn't contain valid json.
     - Added specific tests for sprinkleManager with 100% test coverage
 - Ignore existing `package-lock.json` which caused incorrect dependencies to be installed when upgrading from older versions of UserFrosting.
+- Vendor assets not found in production mode
 
 ## 4.2.0-beta.1
 

app/sprinkles/core/src/ServicesProvider/ServicesProvider.php

@@ -123,6 +123,13 @@ public function register(ContainerInterface $container)
 
             // Load asset schema
             if ($config['assets.use_raw']) {
+
+                // Register sprinkle assets stream, plus vendor assets in shared streams
+                $locator->registerStream('assets', 'vendor', \UserFrosting\BOWER_ASSET_DIR, true);
+                $locator->registerStream('assets', 'vendor', \UserFrosting\NPM_ASSET_DIR, true);
+                $locator->registerStream('assets', 'vendor', \UserFrosting\BROWSERIFIED_ASSET_DIR, true);
+                $locator->registerStream('assets', '', \UserFrosting\DS . \UserFrosting\ASSET_DIR_NAME);
+
                 $baseUrl = $config['site.uri.public'] . '/' . $config['assets.raw.path'];
 
                 $assets = new Assets($locator, 'assets', $baseUrl);
@@ -144,6 +151,11 @@ public function register(ContainerInterface $container)
                     $assets->addAssetBundles($bundles);
                 }
             } else {
+
+                // Register compiled assets stream in public folder + alias for vendor ones
+                $c->locator->registerStream('assets', '', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true);
+                $c->locator->registerStream('assets', 'vendor', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true);
+
                 $baseUrl = $config['site.uri.public'] . '/' . $config['assets.compiled.path'];
                 $assets = new Assets($locator, 'assets', $baseUrl);
 
@@ -249,13 +261,6 @@ public function register(ContainerInterface $container)
 
             $config->set('csrf.blacklist', $csrfBlacklist);
 
-            // Reset 'assets' scheme in locator to use raw assets if specified in config.
-            // Must be done here to prevent circular dependency as config is not loaded in system and locator can't be extended here.
-            if (!$config['assets.use_raw']) {
-                $c->locator->removeStream('assets');
-                $c->locator->registerStream('assets', '', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true);
-            }
-
             return $config;
         };
 

app/system/ServicesProvider.php

@@ -54,12 +54,8 @@ public function register(ContainerInterface $container)
             $locator->registerStream('log', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\LOG_DIR_NAME, true);
             $locator->registerStream('cache', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\CACHE_DIR_NAME, true);
             $locator->registerStream('session', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\SESSION_DIR_NAME, true);
-            $locator->registerStream('assets', 'vendor', \UserFrosting\BOWER_ASSET_DIR, true);
-            $locator->registerStream('assets', 'vendor', \UserFrosting\NPM_ASSET_DIR, true);
-            $locator->registerStream('assets', 'vendor', \UserFrosting\BROWSERIFIED_ASSET_DIR, true);
 
             // Register sprinkles streams
-            $locator->registerStream('assets', '', \UserFrosting\DS . \UserFrosting\ASSET_DIR_NAME);
             $locator->registerStream('config', '', \UserFrosting\DS . \UserFrosting\CONFIG_DIR_NAME);
             $locator->registerStream('extra', '', \UserFrosting\DS . \UserFrosting\EXTRA_DIR_NAME);
             $locator->registerStream('factories', '', \UserFrosting\DS . \UserFrosting\FACTORY_DIR_NAME);