Bundle the icons package instead of using it as an external (#19809)

WordPress · Jan 23, 2020 · 8acb023 · 8acb023
1 parent 5a8eda1
commit 8acb023
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 21 deletions.
diff --git a/packages/components/src/circular-option-picker/index.js b/packages/components/src/circular-option-picker/index.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { __experimentalIcon as Icon, check } from '@wordpress/icons';
+import { Icon, check } from '@wordpress/icons';
 
 /**
  * Internal dependencies

diff --git a/packages/components/src/color-palette/test/__snapshots__/index.js.snap b/packages/components/src/color-palette/test/__snapshots__/index.js.snap
@@ -321,9 +321,6 @@ exports[`ColorPalette should render a dynamic toolbar of colors 1`] = `
           <Icon
             icon={
               <SVG
-                aria-hidden={true}
-                focusable="false"
-                role="img"
                 viewBox="-2 -2 24 24"
                 xmlns="http://www.w3.org/2000/svg"
               >
@@ -334,10 +331,7 @@ exports[`ColorPalette should render a dynamic toolbar of colors 1`] = `
             }
           >
             <SVG
-              aria-hidden={true}
-              focusable="false"
               height={24}
-              role="img"
               viewBox="-2 -2 24 24"
               width={24}
               xmlns="http://www.w3.org/2000/svg"

diff --git a/packages/components/src/custom-select-control/index.js b/packages/components/src/custom-select-control/index.js
@@ -7,7 +7,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { __experimentalIcon as Icon, check } from '@wordpress/icons';
+import { Icon, check } from '@wordpress/icons';
 /**
  * Internal dependencies
  */

diff --git a/packages/dependency-extraction-webpack-plugin/util.js b/packages/dependency-extraction-webpack-plugin/util.js
@@ -1,4 +1,5 @@
 const WORDPRESS_NAMESPACE = '@wordpress/';
+const BUNDLED_PACKAGES = [ '@wordpress/icons' ];
 
 /**
  * Default request to global transformation
@@ -34,6 +35,10 @@ function defaultRequestToExternal( request ) {
 			return 'ReactDOM';
 	}
 
+	if ( BUNDLED_PACKAGES.includes( request ) ) {
+		return undefined;
+	}
+
 	if ( request.startsWith( WORDPRESS_NAMESPACE ) ) {
 		return [ 'wp', camelCaseDash( request.substring( WORDPRESS_NAMESPACE.length ) ) ];
 	}

diff --git a/packages/editor/src/components/post-saved-state/index.js b/packages/editor/src/components/post-saved-state/index.js
@@ -14,7 +14,7 @@ import { withSelect, withDispatch } from '@wordpress/data';
 import { displayShortcut } from '@wordpress/keycodes';
 import { withSafeTimeout, compose } from '@wordpress/compose';
 import { withViewportMatch } from '@wordpress/viewport';
-import { __experimentalIcon as Icon, check } from '@wordpress/icons';
+import { Icon, check } from '@wordpress/icons';
 
 /**
  * Internal dependencies

diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
@@ -1,3 +1,3 @@
-## 1.0.0 (2019-08-15)
+## Master
 
 - Initial release
diff --git a/packages/icons/README.md b/packages/icons/README.md
@@ -15,7 +15,7 @@ _This package assumes that your code will run in an **ES2015+** environment. If
 ## Usage
 
 ```js
-import { __experimentalIcon as Icon, check } from '@wordpress/icons';
+import { Icon, check } from '@wordpress/icons';
 
 <Icon icon={ check } />
 ```

diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js
@@ -1,4 +1,4 @@
-export { default as __experimentalIcon } from './icon';
+export { default as Icon } from './icon';
 
 export { default as check } from './library/check';
 export { default as paragraph } from './library/paragraph';
diff --git a/packages/icons/src/library/check.js b/packages/icons/src/library/check.js
@@ -4,13 +4,7 @@
 import { SVG, Path } from '@wordpress/primitives';
 
 const saved = (
-	<SVG
-		aria-hidden
-		role="img"
-		focusable="false"
-		xmlns="http://www.w3.org/2000/svg"
-		viewBox="-2 -2 24 24"
-	>
+	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M15.3 5.3l-6.8 6.8-2.8-2.8-1.4 1.4 4.2 4.2 8.2-8.2" />
 	</SVG>
 );

diff --git a/packages/primitives/CHANGELOG.md b/packages/primitives/CHANGELOG.md
@@ -1,3 +1,3 @@
-### Master
+## Master
 
 Initial release.
diff --git a/webpack.config.js b/webpack.config.js
@@ -26,9 +26,13 @@ const {
 } = process.env;
 
 const WORDPRESS_NAMESPACE = '@wordpress/';
+const BUNDLED_PACKAGES = [ '@wordpress/icons' ];
 
 const gutenbergPackages = Object.keys( dependencies )
-	.filter( ( packageName ) => packageName.startsWith( WORDPRESS_NAMESPACE ) )
+	.filter( ( packageName ) =>
+		! BUNDLED_PACKAGES.includes( packageName ) &&
+		packageName.startsWith( WORDPRESS_NAMESPACE )
+	)
 	.map( ( packageName ) => packageName.replace( WORDPRESS_NAMESPACE, '' ) );
 
 module.exports = {