@penskemediacorp/larva 1.25.0 → 1.28.0

package/lib/utils/getAllPatternsObj.js

@@ -13,36 +13,41 @@ const config = getAppConfiguration( 'patterns' );
  * return an object representing all the pattern types, patterns, and their variants.
  *
  * @param {string} startPath - Path to look in for all patterns. Should be assets/src/patterns.
- * @return {object} - Object representing all patterns and variants
+ * @return {Object} - Object representing all patterns and variants
  */
 
 module.exports = function getAllPatternsObj( startPath ) {
-
 	const patternDirs = getSubDirectoryNames( startPath );
 
-	let obj = {};
+	const obj = {};
 
 	try {
 		patternDirs.map( ( patternType ) => {
 			let patterns = [];
-			obj[patternType] = {};
+			obj[ patternType ] = {};
 
 			// Modules can be ignored, which maybe is unecessary
 			// but for now continue on that path.
 			if ( 'modules' === patternType ) {
-				patterns = getModuleNamesFromDirectory( startPath, config.ignoredModules );
+				patterns = getModuleNamesFromDirectory(
+					startPath,
+					config.ignoredModules
+				);
 			} else {
-				patterns = getSubDirectoryNames( path.join( startPath, patternType ) );
+				patterns = getSubDirectoryNames(
+					path.join( startPath, patternType )
+				);
 			}
 
 			patterns.map( ( pattern ) => {
-				obj[patternType][pattern] = getPatternVariants( path.join( startPath, `${patternType}/${pattern}` ) );
+				obj[ patternType ][ pattern ] = getPatternVariants(
+					path.join( startPath, `${ patternType }/${ pattern }` )
+				);
 			} );
-
 		} );
 	} catch ( e ) {
 		console.error( e );
 	}
 
 	return obj;
-}
+};

package/lib/utils/getAppConfiguration.js

@@ -18,64 +18,66 @@ const path = require( 'path' );
  */
 
 const defaultConfig = {
-
 	eslint: {
-		configFile: path.join( __dirname, '../../scripts/config/.eslintrc.json' ),
+		configFile: path.join(
+			__dirname,
+			'../../scripts/config/.eslintrc.json'
+		),
 	},
 
 	webpack: {
 		aliases: {
 			'@js': path.resolve( './src/js' ),
 			'@npm': path.resolve( './node_modules' ),
-			'@larva-js': path.resolve( './node_modules/@penskemediacorp/larva-js/src' ),
+			'@larva-js': path.resolve(
+				'./node_modules/@penskemediacorp/larva-js/src'
+			),
 		},
 		entries: {
 			'larva-ui': path.resolve( './entries/larva-ui.entry.js' ),
-			common: path.resolve( './entries/common.entry.js' )
-		}
+			common: path.resolve( './entries/common.entry.js' ),
+		},
 	},
 
 	patterns: {
-		larvaPatternsDir: path.resolve( './node_modules/@penskemediacorp/larva-patterns' ),
+		larvaPatternsDir: path.resolve(
+			'./node_modules/@penskemediacorp/larva-patterns'
+		),
 		projectPatternsDir: path.resolve( './src/patterns' ),
 	},
 
 	assets: {
 		path: ( () => {
-
 			// Fragile way to detect existing Larva sites
 			if ( fs.existsSync( path.resolve( './build/css' ) ) ) {
 				return path.resolve( './' );
 			}
 
 			return path.resolve( './node_modules/@penskemediacorp/larva' );
-		})(),
+		} )(),
 	},
 
 	themeAssets: {},
 };
 
 module.exports = function getAppConfiguration( key, usePackageDefault = true ) {
-
 	try {
-
 		let appRoot = process.cwd();
 
 		if ( 'test' === process.env.NODE_ENV ) {
 			appRoot = path.join( __dirname, '../../__tests__/fixtures/' );
 		}
 
-		let config = require( `${appRoot}/larva.config.js` );
+		const config = require( `${ appRoot }/larva.config.js` );
 
 		// If config not found in approot, fallback to package default in root
-		if ( undefined === config[key] && usePackageDefault ) {
+		if ( undefined === config[ key ] && usePackageDefault ) {
 			return defaultConfig[ key ];
 		}
 
-		return config[key];
-
+		return config[ key ];
 	} catch ( error ) {
-		console.warn( 'Using default configuration. ');
+		console.warn( 'Using default configuration. ' );
 
 		return defaultConfig[ key ];
 	}

package/lib/utils/getArgsFromCli.js

@@ -1,3 +1,3 @@
 module.exports = function getArgsFromCli() {
-	return process.argv.slice(2);
-}
+	return process.argv.slice( 2 );
+};

package/lib/utils/getModuleNamesFromDirectory.js

@@ -1,11 +1,18 @@
 const getSubDirectoryNames = require( './getSubDirectoryNames' );
 const path = require( 'path' );
 
-module.exports = function getModuleNamesFromDirectory( directory, ignoredModules = [] ) {
-	let moduleNames = getSubDirectoryNames( path.join( directory , 'modules' ) );
+module.exports = function getModuleNamesFromDirectory(
+	directory,
+	ignoredModules = []
+) {
+	const moduleNames = getSubDirectoryNames(
+		path.join( directory, 'modules' )
+	);
 
 	return moduleNames.filter( ( moduleName ) => {
-		return ! moduleName.startsWith( '_' ) && -1 === ignoredModules.indexOf( moduleName );
-	});
-
-}
+		return (
+			! moduleName.startsWith( '_' ) &&
+			-1 === ignoredModules.indexOf( moduleName )
+		);
+	} );
+};

package/lib/utils/getPatternData.js

@@ -4,31 +4,39 @@ const path = require( 'path' );
  * Get Pattern Data
  *
  * @param {string} patternsPath
- * @param {object} params Object containing name of pattern
+ * @param {Object} params Object containing name of pattern
  */
 function getPatternData( patternsPath, params ) {
-
 	const variant = params.variant || 'prototype';
-	const patternPath = path.join( patternsPath, params.type, params.name, params.name + '.' + variant + '.js' );
-	const jsonPath = path.join( patternsPath, params.type, params.name, params.name + '.json' )
+	const patternPath = path.join(
+		patternsPath,
+		params.type,
+		params.name,
+		params.name + '.' + variant + '.js'
+	);
+	const jsonPath = path.join(
+		patternsPath,
+		params.type,
+		params.name,
+		params.name + '.json'
+	);
 
 	try {
 		return require( patternPath );
-	} catch( e ) {
+	} catch ( e ) {
 		const originalError = e;
 
 		try {
 			// Backwards compat for Deadline when patterns were stored as JSON
-			let patternData = require( jsonPath );
+			const patternData = require( jsonPath );
 			return patternData;
 		} catch ( e ) {
 			return {
-				message: `Error getting data for "${params.name}".<br>There is likely a problem with ${params.name}.${variant}.js.`,
-				error: originalError
-			}
+				message: `Error getting data for "${ params.name }".<br>There is likely a problem with ${ params.name }.${ variant }.js.`,
+				error: originalError,
+			};
 		}
 	}
-
 }
 
-module.exports = getPatternData;
+module.exports = getPatternData;

package/lib/utils/getPatternPathsToLoad.js

@@ -1,20 +1,20 @@
 const fs = require( 'fs' );
 
 module.exports = function getPatternPathsToLoad( config ) {
-	let paths = [];
+	const paths = [];
 
 	if ( undefined === config ) {
 		throw new Error( `Pattern configuration is undefined.` );
-	};
+	}
 
 	// Look in projectPatternsDir first.
-	if( fs.existsSync( config.projectPatternsDir ) ) {
+	if ( fs.existsSync( config.projectPatternsDir ) ) {
 		paths.push( config.projectPatternsDir );
 	}
 
-	if( fs.existsSync( config.larvaPatternsDir ) ) {
+	if ( fs.existsSync( config.larvaPatternsDir ) ) {
 		paths.push( config.larvaPatternsDir );
 	}
 
 	return paths;
-}
+};

package/lib/utils/getPatternRoutes.js

@@ -16,43 +16,45 @@
  *
  * Return an array with routes for every pattern in the object.
  *
- * @param {object} patternsObj - An object with two levels of keys where patternObj['components']['c-link'] is an array of c-link variants.
- * @return {array} - An array of string routes e.g. [ '/components/c-link/', '/components/c-link/sponsored' ]
+ * @param {Object} patternsObj - An object with two levels of keys where patternObj['components']['c-link'] is an array of c-link variants.
+ * @return {Array} - An array of string routes e.g. [ '/components/c-link/', '/components/c-link/sponsored' ]
  */
 
 const chalk = require( 'chalk' );
 
 module.exports = function getPatternRoutes( patterns ) {
-
 	let patternRoutes = [];
 
 	try {
-
-		patternRoutes = Object.keys( patterns ).map( ( type ) => {
-
-			return Object.keys( patterns[type] ).map( ( name ) => {
-				let path = `${type}/${name}`;
-
-				if ( patterns[type][name].length > 1 ) {
-
-					return patterns[type][name].map( ( variant ) => {
-						if ( 'prototype' !== variant ) {
-							return path + '/' + variant;
-						} else {
-							return path;
+		patternRoutes = Object.keys( patterns )
+			.map( ( type ) => {
+				return Object.keys( patterns[ type ] )
+					.map( ( name ) => {
+						const path = `${ type }/${ name }`;
+
+						if ( patterns[ type ][ name ].length > 1 ) {
+							return patterns[ type ][ name ].map(
+								( variant ) => {
+									if ( 'prototype' !== variant ) {
+										return path + '/' + variant;
+									}
+									return path;
+								}
+							);
 						}
-					} );
-
-				} else {
-					return path;
-				}
-
-			} ).flat();
-
-		} ).flat();
+						return path;
+					} )
+					.flat();
+			} )
+			.flat();
 	} catch ( error ) {
-		console.error( chalk.red( 'Could not build the pattern routes. Is the pattern object structure correct?' ), error );
+		console.error(
+			chalk.red(
+				'Could not build the pattern routes. Is the pattern object structure correct?'
+			),
+			error
+		);
 	}
 
 	return patternRoutes;
-}
+};

package/lib/utils/getPatternType.js

@@ -1,9 +1,9 @@
 // Note 4/6/20 - This might not be necessary since we can use the directory name.
-module.exports = function getPatternType ( patternName ) {
+module.exports = function getPatternType( patternName ) {
 	const patternNamespace = patternName.substring( 0, 2 );
 	let patternType = 'modules';
 
-	if ( 'o-' ===  patternNamespace ) {
+	if ( 'o-' === patternNamespace ) {
 		patternType = 'objects';
 	}
 
@@ -12,4 +12,4 @@ module.exports = function getPatternType ( patternName ) {
 	}
 
 	return patternType;
-}
+};

package/lib/utils/getPatternVariants.js

@@ -1,17 +1,16 @@
 /**
- * Return an array of "variants", or the pattern.XX.js from a 
+ * Return an array of "variants", or the pattern.XX.js from a
  * given directory.
- * 
+ *
  * @param {string} startPath - the pattern directory to search.
  */
 
 const fs = require( 'fs' );
 
 // https://regex101.com/r/DgnTR4/2
-const regex = new RegExp( '(.[^.]+)\.(.+)\.js$' );
+const regex = new RegExp( '(.[^.]+).(.+).js$' );
 
 module.exports = function getPatternVariants( startPath ) {
-
 	// Only return Node prototype files that follow pattern name.XX.js
 	const files = fs.readdirSync( startPath ).filter( ( file ) => {
 		if ( /.+\..*\.js$/.test( file ) ) {
@@ -20,5 +19,5 @@ module.exports = function getPatternVariants( startPath ) {
 	} );
 
 	// Return array of the name of the variant e.g. XX in name.XX.js
-	return files.map( ( file ) => file.match( regex )[2] );
-};
+	return files.map( ( file ) => file.match( regex )[ 2 ] );
+};

package/lib/utils/getPatternsIndexPath.js

@@ -1,11 +1,11 @@
 const isCoreTheme = require( './isCoreTheme' );
 
 module.exports = function getPatternsIndexPath( config ) {
-	// TODO: add parent/child-esque logic for Larva patterns will occur i.e. the app 
+	// TODO: add parent/child-esque logic for Larva patterns will occur i.e. the app
 	// should look first in the theme, then in larvaPatternsDir.
 	// if ( isCoreTheme( config ) ) {
-		return config.larvaPatternsDir;
+	return config.larvaPatternsDir;
 	// } else {
 	// 	return config.projectPatternsDir;
 	// }
-}
+};

package/lib/utils/getSubDirectoryNames.js

@@ -5,19 +5,19 @@ const chalk = require( 'chalk' );
  * Get Subdirectory names
  *
  * @param {string} path path to a directory containing subdirectories.
- * @return {array} array of strings representing names of subdirectories.
+ * @return {Array} array of strings representing names of subdirectories.
  *
  * @link: https://stackoverflow.com/questions/18112204/get-all-directories-within-directory-nodejs
  **/
 
 module.exports = function getSubDirectoryNames( path ) {
 	try {
-		return fs.readdirSync( path ).filter( function( file ) {
+		return fs.readdirSync( path ).filter( function ( file ) {
 			if ( 'node_modules' !== file && 'fixtures' !== file ) {
 				return fs.statSync( path + '/' + file ).isDirectory();
 			}
-		});
+		} );
 	} catch {
-		console.error( path + ' doesn\'t exist.' );
+		console.error( path + " doesn't exist." );
 	}
-}
+};

package/lib/utils/isCoreTheme.js

@@ -1,8 +1,7 @@
-
 module.exports = function isCoreTheme( config ) {
 	if ( undefined === config.themePatternsDir ) {
 		return true;
 	}
 
 	return false;
-}
+};

package/lib/utils/renderSass.js

@@ -3,18 +3,21 @@ const path = require( 'path' );
 
 module.exports = function renderSass( sassData ) {
 	return new Promise( ( resolve, reject ) => {
-		sass.render( {
-			data: sassData,
-			includePaths: [
-				path.resolve( process.cwd(), './node_modules'), // Command should be run from same directory as node_modules
-				path.resolve( process.cwd(), './src')
-			]
-		}, ( err, result ) => {
-			if ( err ) {
-				reject( err );
-			}
+		sass.render(
+			{
+				data: sassData,
+				includePaths: [
+					path.resolve( process.cwd(), './node_modules' ), // Command should be run from same directory as node_modules
+					path.resolve( process.cwd(), './src' ),
+				],
+			},
+			( err, result ) => {
+				if ( err ) {
+					reject( err );
+				}
 
-			resolve( result );
-		});
-	});
-}
+				resolve( result );
+			}
+		);
+	} );
+};

package/lib/utils/spawnScript.js

@@ -5,7 +5,7 @@ const getArgsFromCli = require( './getArgsFromCli' );
 // Filter out the first CLI argument which is the Larva command,
 // and not needed for the binary.
 const cliArgsWithoutScriptName = ( () => {
-	let cliArgs = getArgsFromCli();
+	const cliArgs = getArgsFromCli();
 
 	if ( cliArgs.length ) {
 		cliArgs.shift();
@@ -15,12 +15,7 @@ const cliArgsWithoutScriptName = ( () => {
 } )();
 
 module.exports = function spawnScript( binaryFile, scriptArgs ) {
-
-	spawn.sync(
-		binaryFile,
-		[
-			... scriptArgs,
-			... cliArgsWithoutScriptName
-		], { stdio: 'inherit' }
-	);
+	spawn.sync( binaryFile, [ ...scriptArgs, ...cliArgsWithoutScriptName ], {
+		stdio: 'inherit',
+	} );
 };

package/lib/utils/writeJsonToFile.js

@@ -1,6 +1,6 @@
 const fs = require( 'fs' );
 
 module.exports = function writePatternDataToFile( filepath, data ) {
-	let json = JSON.stringify( data );
+	const json = JSON.stringify( data );
 	fs.writeFileSync( filepath, json );
-};
+};

package/lib/writeJson.js

@@ -9,30 +9,46 @@ const writeJsonToFile = require( './utils/writeJsonToFile' );
 
 // The fromLarva flag can come from CLI argument
 module.exports = function writeJson( patternConfig, fromLarva = false ) {
-
-	const sourceDirectory = ( true === fromLarva ) ? patternConfig.larvaPatternsDir : patternConfig.projectPatternsDir;
-	const ignoredModules  = patternConfig.ignoredModules ? patternConfig.ignoredModules : [];
-	const modulesArr      = getModuleNamesFromDirectory( sourceDirectory, ignoredModules );
+	const sourceDirectory =
+		true === fromLarva
+			? patternConfig.larvaPatternsDir
+			: patternConfig.projectPatternsDir;
+	const ignoredModules = patternConfig.ignoredModules
+		? patternConfig.ignoredModules
+		: [];
+	const modulesArr = getModuleNamesFromDirectory(
+		sourceDirectory,
+		ignoredModules
+	);
 
 	modulesArr.forEach( ( moduleName ) => {
-
 		const startPath = sourceDirectory + '/modules/' + moduleName;
 		const variants = getPatternVariants( startPath );
 
 		variants.forEach( ( variant ) => {
-
 			const moduleData = getPatternData( sourceDirectory, {
 				type: 'modules',
 				name: moduleName,
-				variant: variant
+				variant,
 			} );
 
-			const jsonDestPath = path.resolve( patternConfig.projectPatternsDir, '../../build/json/modules/' + moduleName + '.' + variant + '.json' );
+			const jsonDestPath = path.resolve(
+				patternConfig.projectPatternsDir,
+				'../../build/json/modules/' +
+					moduleName +
+					'.' +
+					variant +
+					'.json'
+			);
 
 			// If JSON data and module prototype are the same, pass, otherwise write the data to file
 			let hasChanged = true;
 			try {
-				if ( fs.existsSync( jsonDestPath ) && JSON.stringify( require( jsonDestPath ) ) === JSON.stringify( moduleData ) ) {
+				if (
+					fs.existsSync( jsonDestPath ) &&
+					JSON.stringify( require( jsonDestPath ) ) ===
+						JSON.stringify( moduleData )
+				) {
 					hasChanged = false;
 				}
 			} catch ( error ) {
@@ -41,13 +57,16 @@ module.exports = function writeJson( patternConfig, fromLarva = false ) {
 
 			if ( hasChanged ) {
 				writeJsonToFile( jsonDestPath, moduleData );
-				console.log( chalk.green.bold( `Wrote JSON for ${moduleName}.${variant}` ) );
+				console.log(
+					chalk.green.bold(
+						`Wrote JSON for ${ moduleName }.${ variant }`
+					)
+				);
 			} else {
-				console.log( chalk.grey( `No updates in ${moduleName}.${variant}` ) );
+				console.log(
+					chalk.grey( `No updates in ${ moduleName }.${ variant }` )
+				);
 			}
-		}
-
-		);
-
+		} );
 	} );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penskemediacorp/larva",
-  "version": "1.25.0",
+  "version": "1.28.0",
   "description": "> TODO: description",
   "author": "laras126 <laras126@gmail.com>",
   "homepage": "https://github.com/Penske-Media-Corp/pmc-larva/tree/master/packages/larva#readme",
@@ -43,16 +43,16 @@
   "dependencies": {
     "@babel/core": "^7.10.5",
     "@babel/preset-env": "^7.10.4",
-    "@penskemediacorp/backstopjs-config": "^1.24.1",
-    "@penskemediacorp/eslint-config": "^1.24.1",
-    "@penskemediacorp/larva-css": "^1.25.0",
-    "@penskemediacorp/larva-js": "^1.24.1",
-    "@penskemediacorp/larva-patterns": "^1.25.0",
-    "@penskemediacorp/larva-scss": "^1.24.1",
-    "@penskemediacorp/larva-svg": "^1.24.1",
-    "@penskemediacorp/larva-tokens": "^1.24.1",
-    "@penskemediacorp/stylelint-config": "^1.24.1",
-    "@penskemediacorp/twig-to-php-parser": "^1.24.1",
+    "@penskemediacorp/backstopjs-config": "^1.28.0",
+    "@penskemediacorp/eslint-config": "^1.28.0",
+    "@penskemediacorp/larva-css": "^1.28.0",
+    "@penskemediacorp/larva-js": "^1.28.0",
+    "@penskemediacorp/larva-patterns": "^1.28.0",
+    "@penskemediacorp/larva-scss": "^1.28.0",
+    "@penskemediacorp/larva-svg": "^1.28.0",
+    "@penskemediacorp/larva-tokens": "^1.28.0",
+    "@penskemediacorp/stylelint-config": "^1.28.0",
+    "@penskemediacorp/twig-to-php-parser": "^1.28.0",
     "axios": "^0.21.1",
     "babel-loader": "^8.1.0",
     "chalk": "^4.1.0",
@@ -89,5 +89,8 @@
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.12"
   },
-  "gitHead": "d9e58ce95222a2ba4a7a8f1659bd34fea88b1911"
+  "devDependencies": {
+    "prettier": "npm:wp-prettier@^2.6.2"
+  },
+  "gitHead": "36e335324c72395c8ef8f1d98b204d19b53a23e2"
 }