@wordpress/babel-plugin-makepot 4.3.2 → 5.0.1-next.957ca95e4c.0

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 5.0.0 (2022-08-24)
+
+### Breaking Change
+
+-   Increase the minimum Node.js version to 14 ([#43141](https://github.com/WordPress/gutenberg/pull/43141)).
+
 ## 4.0.0 (2021-01-21)
 
 ### Breaking Changes

package/README.md

@@ -21,7 +21,7 @@ Install the module:
 npm install @wordpress/babel-plugin-makepot --save-dev
 ```
 
-**Note**: This package requires Node.js 12.0.0 or later. It is not compatible with older versions.
+**Note**: This package requires Node.js 14.0.0 or later. It is not compatible with older versions.
 
 ## Contributing to this package
 

package/index.js

@@ -33,16 +33,7 @@
  */
 
 const { po } = require( 'gettext-parser' );
-const {
-	pick,
-	reduce,
-	uniq,
-	forEach,
-	sortBy,
-	isEqual,
-	merge,
-	isEmpty,
-} = require( 'lodash' );
+const { pick, reduce, forEach, isEqual, merge, isEmpty } = require( 'lodash' );
 const { relative, sep } = require( 'path' );
 const { writeFileSync } = require( 'fs' );
 
@@ -197,6 +188,20 @@ function isSameTranslation( a, b ) {
 	);
 }
 
+/**
+ * Sorts multiple translation objects by their reference.
+ * The reference is where they occur, in the format `file:line`.
+ *
+ * @param {Array} translations Array of translations to sort.
+ *
+ * @return {Array} Sorted translations.
+ */
+function sortByReference( translations = [] ) {
+	return [ ...translations ].sort( ( a, b ) =>
+		a.comments.reference.localeCompare( b.comments.reference )
+	);
+}
+
 module.exports = () => {
 	const strings = {};
 	let nplurals = 2,
@@ -324,18 +329,15 @@ module.exports = () => {
 						( memo, file ) => {
 							for ( const context in strings[ file ] ) {
 								// Within the same file, sort translations by line.
-								const sortedTranslations = sortBy(
-									strings[ file ][ context ],
-									'comments.reference'
+								const sortedTranslations = sortByReference(
+									strings[ file ][ context ]
 								);
 
 								forEach(
 									sortedTranslations,
 									( translation ) => {
-										const {
-											msgctxt = '',
-											msgid,
-										} = translation;
+										const { msgctxt = '', msgid } =
+											translation;
 										if (
 											! memo.hasOwnProperty( msgctxt )
 										) {
@@ -349,16 +351,18 @@ module.exports = () => {
 												memo[ msgctxt ][ msgid ]
 											)
 										) {
-											translation.comments.reference = uniq(
-												[
-													memo[ msgctxt ][ msgid ]
-														.comments.reference,
-													translation.comments
-														.reference,
-												]
-													.join( '\n' )
-													.split( '\n' )
-											).join( '\n' );
+											translation.comments.reference = [
+												...new Set(
+													[
+														memo[ msgctxt ][ msgid ]
+															.comments.reference,
+														translation.comments
+															.reference,
+													]
+														.join( '\n' )
+														.split( '\n' )
+												),
+											].join( '\n' );
 										}
 
 										memo[ msgctxt ][ msgid ] = translation;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-makepot",
-	"version": "4.3.2",
+	"version": "5.0.1-next.957ca95e4c.0",
 	"description": "WordPress Babel internationalization (i18n) plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -21,7 +21,7 @@
 		"url": "https://github.com/WordPress/gutenberg/issues"
 	},
 	"engines": {
-		"node": ">=12"
+		"node": ">=14"
 	},
 	"files": [
 		"index.js"
@@ -37,5 +37,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "446565ecaa40370173c18926535e975ec5652b71"
+	"gitHead": "272a74bbbaab10ee24424eafe9578e705fbfbbb4"
 }