Merge branch 'master' into release/2.7

Author: Aljullu

assets/js/icons/index.js

@@ -1,6 +1,7 @@
 export { default as Icon } from './icon';
 
 export { default as arrowBack } from './library/arrow-back';
+export { default as arrowDownAlt2 } from './library/arrow-down-alt2';
 export { default as bank } from './library/bank';
 export { default as barcode } from './library/barcode';
 export { default as bill } from './library/bill';
@@ -20,6 +21,7 @@ export { default as grid } from './library/grid';
 export { default as image } from './library/image';
 export { default as list } from './library/list';
 export { default as more } from './library/more';
+export { default as noAlt } from './library/no-alt';
 export { default as notes } from './library/notes';
 export { default as notice } from './library/notice';
 export { default as radioSelected } from './library/radio-selected';

assets/js/icons/library/arrow-down-alt2.js

@@ -0,0 +1,27 @@
+/**
+ * External dependencies
+ */
+import { SVG } from 'wordpress-components';
+import classnames from 'classnames';
+
+const arrowDownAlt2 = ( { className, size, ...extraProps } ) => {
+	const iconClass = classnames(
+		'dashicon',
+		'dashicons-arrow-down-alt2',
+		className
+	);
+	return (
+		<SVG
+			xmlns="http://www.w3.org/2000/svg"
+			viewBox="0 0 20 20"
+			className={ iconClass }
+			width={ size }
+			height={ size }
+			{ ...extraProps }
+		>
+			<path d="M5 6l5 5 5-5 2 1-7 7-7-7z" />
+		</SVG>
+	);
+};
+
+export default arrowDownAlt2;

assets/js/icons/library/no-alt.js

@@ -0,0 +1,26 @@
+/**
+ * External dependencies
+ */
+import { SVG } from 'wordpress-components';
+import classnames from 'classnames';
+const noAlt = ( { className, size, ...extraProps } ) => {
+	const iconClass = classnames(
+		'dashicon',
+		'dashicons-arrow-down-alt2',
+		className
+	);
+	return (
+		<SVG
+			xmlns="http://www.w3.org/2000/svg"
+			viewBox="0 0 20 20"
+			className={ iconClass }
+			width={ size }
+			height={ size }
+			{ ...extraProps }
+		>
+			<path d="M14.95 6.46L11.41 10l3.54 3.54-1.41 1.41L10 11.42l-3.53 3.53-1.42-1.42L8.58 10 5.05 6.47l1.42-1.42L10 8.58l3.54-3.53z" />
+		</SVG>
+	);
+};
+
+export default noAlt;

assets/js/module_replacements/dashicon.js

@@ -0,0 +1,23 @@
+/**
+ * External dependencies
+ */
+import {
+	arrowDownAlt2 as ArrowDownIcon,
+	noAlt as DismissIcon,
+} from '@woocommerce/icons';
+import { createElement } from '@wordpress/element';
+
+export default ( { icon, size = 20, className, ...extraProps } ) => {
+	let Icon = () => null;
+	switch ( icon ) {
+		case 'arrow-down-alt2':
+			Icon = ArrowDownIcon;
+			break;
+		case 'no-alt':
+			Icon = DismissIcon;
+			break;
+	}
+	// can't use JSX here because the Webpack NormalModuleReplacementPlugin
+	// is unable to parse JSX at that point in the build.
+	return createElement( Icon, { size, className, ...extraProps } );
+};

bin/webpack-helpers.js

@@ -6,11 +6,17 @@ const MergeExtractFilesPlugin = require( './merge-extract-files-webpack-plugin'
 const MiniCssExtractPlugin = require( 'mini-css-extract-plugin' );
 const ProgressBarPlugin = require( 'progress-bar-webpack-plugin' );
 const DependencyExtractionWebpackPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
+const { NormalModuleReplacementPlugin } = require( 'webpack' );
 const WebpackRTLPlugin = require( 'webpack-rtl-plugin' );
 const chalk = require( 'chalk' );
 const { omit } = require( 'lodash' );
 const NODE_ENV = process.env.NODE_ENV || 'development';
 
+const dashIconReplacementModule = path.resolve(
+	__dirname,
+	'../assets/js/module_replacements/dashicon.js'
+);
+
 function findModuleMatch( module, match ) {
 	if ( module.request && match.test( module.request ) ) {
 		return true;
@@ -359,6 +365,10 @@ const getMainConfig = ( options = {} ) => {
 				requestToExternal,
 				requestToHandle,
 			} ),
+			new NormalModuleReplacementPlugin(
+				/dashicon/,
+				( result ) => ( result.resource = dashIconReplacementModule )
+			),
 		],
 		resolve,
 	};
@@ -454,6 +464,10 @@ const getFrontConfig = ( options = {} ) => {
 				requestToExternal,
 				requestToHandle,
 			} ),
+			new NormalModuleReplacementPlugin(
+				/dashicon/,
+				( result ) => ( result.resource = dashIconReplacementModule )
+			),
 		],
 		resolve,
 	};
@@ -586,6 +600,10 @@ const getPaymentMethodsExtensionConfig = ( options = {} ) => {
 				requestToExternal,
 				requestToHandle,
 			} ),
+			new NormalModuleReplacementPlugin(
+				/dashicon/,
+				( result ) => ( result.resource = dashIconReplacementModule )
+			),
 		],
 		resolve,
 	};