@penskemediacorp/larva 0.3.9-develop.3 → 0.3.9-develop.5

package/lib/generateStatic.js

@@ -8,7 +8,7 @@ const getAppConfiguration = require( './utils/getAppConfiguration' );
 const copySyncHelper = require( './utils/copySyncHelper' );
 
 const assetsConfig = getAppConfiguration( 'assets' );
-const webfontsConfig = getAppConfiguration( 'webfonts' );
+const themeAssetsConfig = getAppConfiguration( 'themeAssets' );
 
 /**
  * Generate Static HTML
@@ -67,7 +67,15 @@ module.exports = function generateStatic( routesArr, buildPath, done, urlBase =
 	});
 
 	copySyncHelper( publicAssetsSrc, publicAssetsDest );
-	copySyncHelper( webfontsConfig.path, path.join( publicAssetsDest, 'webfonts' ) );
+
+	const themeAssetKeys = Object.keys( themeAssetsConfig );
+
+	themeAssetKeys.forEach( key => {
+		const src = themeAssetsConfig[key];
+		const dest = path.join( buildPath, `../assets/theme/${key}` );
+
+		copySyncHelper( src, dest );
+	});
 
 	// Build the site.
 	// Cycle through the list of routes and write the response

package/lib/server.js

@@ -23,7 +23,7 @@ const app = express();
 const patternConfig = getAppConfiguration( 'patterns' );
 const brandConfig = getAppConfiguration( 'brand' );
 const assetsConfig = getAppConfiguration( 'assets' );
-const webfontsConfig = getAppConfiguration( 'webfonts' );
+const themeAssetsConfig = getAppConfiguration( 'themeAssets' );
 const twigPaths = getPatternPathsToLoad( patternConfig );
 
 let loader = new TwingLoaderFilesystem( twigPaths );
@@ -84,9 +84,12 @@ if ( fs.existsSync( assetsConfig.path ) ) {
 	app.use( '/assets' , express.static( assetsConfig.path ) );
 }
 
-if ( fs.existsSync( webfontsConfig.path ) ) {
-	app.use( '/assets/public/webfonts' , express.static( webfontsConfig.path ) );
-}
+// Expose any theme directories with assets in the express server
+const themeAssetKeys = Object.keys( themeAssetsConfig );
+
+themeAssetKeys.forEach( key => {
+	app.use( '/assets/theme/' + key , express.static( themeAssetsConfig[key] ) );
+});
 
 app.use( '/:source?/css', function (req, res) {
 

package/lib/utils/getAppConfiguration.js

@@ -52,9 +52,7 @@ const defaultConfig = {
 		})(),
 	},
 
-	webfonts: {
-		path: path.resolve( './src/fonts' )
-	},
+	themeAssets: {},
 };
 
 module.exports = function getAppConfiguration( key, usePackageDefault = true ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penskemediacorp/larva",
-  "version": "0.3.9-develop.3+7ba1cc94",
+  "version": "0.3.9-develop.5+c3d02735",
   "description": "> TODO: description",
   "author": "laras126 <laras126@gmail.com>",
   "homepage": "https://github.com/Penske-Media-Corp/pmc-larva/tree/master/packages/larva#readme",
@@ -47,7 +47,7 @@
     "@penskemediacorp/eslint-config": "^0.3.8",
     "@penskemediacorp/larva-css": "^0.3.8",
     "@penskemediacorp/larva-js": "^0.3.5",
-    "@penskemediacorp/larva-patterns": "^0.3.9-develop.3+7ba1cc94",
+    "@penskemediacorp/larva-patterns": "^0.3.8",
     "@penskemediacorp/larva-scss": "^0.3.5",
     "@penskemediacorp/larva-svg": "^0.3.5",
     "@penskemediacorp/larva-tokens": "^0.3.8",
@@ -88,5 +88,5 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.12"
   },
-  "gitHead": "7ba1cc945dba54ac8eaefa2e12c21007f8819f26"
+  "gitHead": "c3d027359877e55ce1fdae88fb2df3c2768acd52"
 }