Update wp-scripts and ensure that tests pass using the new rulesets.

.eslintrc.js

@@ -2,11 +2,11 @@ module.exports = {
 	root: true,
 	env: {
 		es6: true,
-		node: true
+		node: true,
 	},
 	extends: 'plugin:@wordpress/eslint-plugin/recommended',
 	rules: {
 		'one-var': [ 'error', 'never' ],
-		'prefer-arrow-callback': [ 'error' ]
-	}
+		'prefer-arrow-callback': [ 'error' ],
+	},
 };

.npmpackagejsonlintrc.json

@@ -0,0 +1,35 @@
+{
+	"extends": "@wordpress/npm-package-json-lint-config",
+	"rules": {
+		"valid-values-license": [ "error", [ "MIT" ] ],
+		"description-format": [
+			"error",
+			{
+				"requireCapitalFirstLetter": true,
+				"requireEndingPeriod": true
+			}
+		],
+		"prefer-no-devDependencies": "error",
+		"require-publishConfig": "error",
+		"require-repository-directory": "error",
+		"valid-values-author": [ "error", [ "The WordPress Contributors" ] ],
+		"valid-values-publishConfig": [
+			"error",
+			[
+				{
+					"access": "public"
+				}
+			]
+		]
+	},
+	"overrides": [
+		{
+			"patterns": [ "./package.json" ],
+			"rules": {
+				"require-publishConfig": "off",
+				"require-repository-directory": "off",
+				"prefer-no-devDependencies": "off"
+			}
+		}
+	]
+}

.prettierrc.js

@@ -0,0 +1,3 @@
+// Import the default config file and expose it in the project root.
+// Useful for editor integrations.
+module.exports = require('@wordpress/prettier-config');

lib/map_old_to_new_file_path.js

@@ -19,10 +19,16 @@ function mapOldToNewFilePath( filePath, fileMappings ) {
 		}
 
 		// Regex to match the second filename of the diff header.
-		const headerRegex = new RegExp( '((diff \\-\\-git .* )(' + oldPath + ')(\\n))', 'ig' );
+		const headerRegex = new RegExp(
+			'((diff \\-\\-git .* )(' + oldPath + ')(\\n))',
+			'ig'
+		);
 
 		// Regex to match the old and new file name of the chunks within the diff.
-		const chunkFilenameRegex = new RegExp( '((-{3}|\\+{3})( ' + oldPath + '))', 'ig' );
+		const chunkFilenameRegex = new RegExp(
+			'((-{3}|\\+{3})( ' + oldPath + '))',
+			'ig'
+		);
 
 		if ( ! body.match( chunkFilenameRegex ) ) {
 			continue;
@@ -35,7 +41,13 @@ function mapOldToNewFilePath( filePath, fileMappings ) {
 
 		// Logs the mapping.
 		if ( body !== newBody ) {
-			grunt.log.writeln( 'Old file path ' + oldPath + ' found in patch. This path has been automatically replaced by ' + newPath + '.' );
+			grunt.log.writeln(
+				'Old file path ' +
+					oldPath +
+					' found in patch. This path has been automatically replaced by ' +
+					newPath +
+					'.'
+			);
 		}
 	}
 

lib/patch.js

@@ -52,7 +52,8 @@ module.exports = {
 		try {
 			diff.split( '\n' ).forEach( ( line ) => {
 				// these are often the first line
-				if ( startsWith( line, 'Index: src/' ) ||
+				if (
+					startsWith( line, 'Index: src/' ) ||
 					startsWith( line, 'Index: tests/' ) ||
 					startsWith( line, 'Index: tools/' ) ||
 					startsWith( line, 'diff --git src' ) ||
@@ -61,13 +62,13 @@ module.exports = {
 					startsWith( line, 'diff --git a/src' ) ||
 					startsWith( line, 'diff --git a/test' ) ||
 					startsWith( line, 'diff --git a/tools' )
-
 				) {
 					throw false;
 				}
 
 				wpDashExceptions.forEach( ( exception ) => {
-					if ( startsWith( line, 'Index: ' + exception ) ||
+					if (
+						startsWith( line, 'Index: ' + exception ) ||
 						startsWith( line, 'diff --git ' + exception ) ||
 						startsWith( line, 'diff --git a/' + exception )
 					) {
@@ -76,15 +77,17 @@ module.exports = {
 				} );
 
 				noWpDashExceptions.forEach( ( exception ) => {
-					if ( startsWith( line, 'Index: ' + exception ) ||
+					if (
+						startsWith( line, 'Index: ' + exception ) ||
 						startsWith( line, 'diff --git ' + exception ) ||
 						startsWith( line, 'diff --git a/' + exception )
 					) {
 						throw true;
 					}
 				} );
 
-				if ( startsWith( line, 'Index: wp-' ) ||
+				if (
+					startsWith( line, 'Index: wp-' ) ||
 					startsWith( line, 'Index: trunk/wp-' ) ||
 					startsWith( line, 'diff --git wp-' ) ||
 					startsWith( line, 'diff --git a/wp-' )
@@ -98,5 +101,4 @@ module.exports = {
 		}
 		return src;
 	},
-
 };

lib/regex.js

@@ -1,6 +1,8 @@
 module.exports = {
 	patchAttachments( html ) {
-		return html.match( /<dt>\s*<a\s+href="([^"]+?)(diff|patch)"\s+title="View attachment">([^<]+)/g );
+		return html.match(
+			/<dt>\s*<a\s+href="([^"]+?)(diff|patch)"\s+title="View attachment">([^<]+)/g
+		);
 	},
 
 	urlsFromAttachmentList( html ) {
@@ -15,12 +17,14 @@ module.exports = {
 		return longMatches
 			.map( ( match ) => {
 				if ( match.match( /(patch|diff)"/ ) ) {
-					return match
-						// Remove any HTML tags.
-						.replace( /<\/?[^>]+>/g, '' )
-						// Collapse consecutive whitespace characters into one space.
-						.replace( /\s+/g, ' ' )
-						.trim();
+					return (
+						match
+							// Remove any HTML tags.
+							.replace( /<\/?[^>]+>/g, '' )
+							// Collapse consecutive whitespace characters into one space.
+							.replace( /\s+/g, ' ' )
+							.trim()
+					);
 				}
 				return false;
 			} )
@@ -30,5 +34,4 @@ module.exports = {
 	localFileClean( file ) {
 		return file.replace( '?', '' ).replace( /\s/g, '' );
 	},
-
 };

lib/trac.js

@@ -4,9 +4,11 @@ const grunt = require( 'grunt' );
 module.exports = {
 	convertToRaw( parsedUrl ) {
 		grunt.log.debug( 'convertToRaw: ' + JSON.stringify( parsedUrl ) );
-		parsedUrl.pathname = parsedUrl.pathname.replace( /attachment/, 'raw-attachment' );
+		parsedUrl.pathname = parsedUrl.pathname.replace(
+			/attachment/,
+			'raw-attachment'
+		);
 		grunt.log.debug( 'converted_from_raw: ' + url.format( parsedUrl ) );
 		return url.format( parsedUrl );
 	},
-
 };

package.json

@@ -1,12 +1,8 @@
 {
 	"name": "grunt-patch-wordpress",
 	"version": "2.0.0",
-	"description": "Patch your core WordPress",
-	"author": {
-		"name": "Aaron Jorbin",
-		"email": "aaron@jorb.in",
-		"url": "http://aaron.jorb.in"
-	},
+	"description": "Patch your core WordPress.",
+	"author": "The WordPress Contributors",
 	"license": "MIT",
 	"keywords": [
 		"gruntplugin"