Fixes for 5.3.1 (#3370)

* Fix import locale

* Bump packages

* Use new redux tools

* Fix unit tests

fix

* Fix locale files with incorrect interpolation

* Add NE flag to Apache when URL is encoded

* Apply case transform to URL path

This fixes URLs with mixed case not being detected as a match

* Bundle 5.3.1

client/page/io/importer.js

@@ -2,10 +2,9 @@
  * External dependencies
  */
 
-import React from 'react';
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 
-const Importer = props => {
+function Importer( props ) {
 	const { plugin, doImport } = props;
 	const { name, total } = plugin;
 	const clicker = () => {
@@ -14,10 +13,10 @@ const Importer = props => {
 
 	return (
 		<div className="plugin-importer">
-			<p><strong>{ name }</strong> ({ __( 'total = ', 'redirection' ) + total } )</p>
+			<p><strong>{ name }</strong> ({ sprintf( __( 'total = %d', 'redirection' ), total ) })</p>
 
 			<button onClick={ clicker } className="button-secondary">
-				{ __( 'Import from %s', { args: name } ) }
+				{ sprintf( __( 'Import from %s', 'redirection' ), name ) }
 			</button>
 		</div>
 	);

client/state/index.js

@@ -6,7 +6,7 @@ import {
 	applyMiddleware,
 	createStore,
 } from 'redux';
-import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly';
+import { composeWithDevTools } from '@redux-devtools/extension';
 import thunk from 'redux-thunk';
 import reducers from './reducers';
 import { urlMiddleware } from 'state/middleware';
@@ -15,10 +15,6 @@ import { urlMiddleware } from 'state/middleware';
  * Internal dependencies
  */
 
-const composeEnhancers = composeWithDevTools( {
-	name: 'Redirection',
-} );
-
 const middlewares = [
 	thunk,
 	urlMiddleware,
@@ -28,7 +24,7 @@ export default function createReduxStore( initialState = {} ) {
 	const store = createStore(
 		reducers,
 		initialState,
-		composeEnhancers( applyMiddleware( ...middlewares ) )
+		composeWithDevTools( applyMiddleware( ...middlewares ) )
 	);
 
 	return store;

composer.json

@@ -7,7 +7,8 @@
     },
     "scripts": {
         "pot": "wp i18n make-pot . locale/redirection.pot --ignore-domain --exclude=redirection-strings.php",
-        "json": "wp i18n make-json locale --purge"
+        "json": "wp i18n make-json locale --purge",
+        "test": "./vendor/bin/phpunit"
     },
     "config": {
         "allow-plugins": {

e2e/__tests__/url.json

@@ -462,5 +462,31 @@
 				"status": 200
 			}
 		}
+	],
+	[
+		"Test array query parameter with case",
+		{
+			"source": {
+				"url": "/array?queryParam[thing]=1"
+			},
+			"target": {
+				"location": "/plain-redirect/",
+				"status": 301,
+				"agent": true
+			}
+		}
+	],
+	[
+		"Test array query parameter without case",
+		{
+			"source": {
+				"url": "/array?queryparam[thing]=1"
+			},
+			"target": {
+				"location": "/plain-redirect/",
+				"status": 301,
+				"agent": true
+			}
+		}
 	]
 ]

gulpfile.js

@@ -135,7 +135,11 @@ function potJson( done ) {
 	return src( [ 'locale/*.po' ] )
 		.pipe( po2json() )
 		.pipe( through.obj( ( file, enc, cb ) => {
-			const json = JSON.parse( String( file.contents ) );
+			const json = JSON
+				.parse( String( file.contents )
+				.replace( ' {code', ' {{code' )
+				.replace( '{{{', '{{' )
+				.replace( '}}}', '}}' ) );
 
 			json[ '' ] = {
 				'plural-forms': json[ '' ][ 'plural-forms' ]