From bb46c715fc86f408162b538277c73f15b96aefd4 Mon Sep 17 00:00:00 2001 From: Marcus Kazmierczak Date: Fri, 24 Jan 2020 10:14:20 -0800 Subject: [PATCH 1/2] Switch social-links to import svg parts from primitives not components --- packages/block-library/package.json | 1 + packages/block-library/src/social-link/icons/amazon.js | 3 +-- packages/block-library/src/social-link/icons/bandcamp.js | 2 +- packages/block-library/src/social-link/icons/behance.js | 3 +-- packages/block-library/src/social-link/icons/chain.js | 3 +-- packages/block-library/src/social-link/icons/codepen.js | 3 +-- packages/block-library/src/social-link/icons/deviantart.js | 3 +-- packages/block-library/src/social-link/icons/dribbble.js | 3 +-- packages/block-library/src/social-link/icons/dropbox.js | 3 +-- packages/block-library/src/social-link/icons/etsy.js | 3 +-- packages/block-library/src/social-link/icons/facebook.js | 3 +-- packages/block-library/src/social-link/icons/feed.js | 3 +-- packages/block-library/src/social-link/icons/fivehundredpx.js | 3 +-- packages/block-library/src/social-link/icons/flickr.js | 3 +-- packages/block-library/src/social-link/icons/foursquare.js | 3 +-- packages/block-library/src/social-link/icons/github.js | 3 +-- packages/block-library/src/social-link/icons/goodreads.js | 3 +-- packages/block-library/src/social-link/icons/google.js | 3 +-- packages/block-library/src/social-link/icons/instagram.js | 3 +-- packages/block-library/src/social-link/icons/lastfm.js | 3 +-- packages/block-library/src/social-link/icons/linkedin.js | 3 +-- packages/block-library/src/social-link/icons/mail.js | 3 +-- packages/block-library/src/social-link/icons/mastodon.js | 3 +-- packages/block-library/src/social-link/icons/medium.js | 3 +-- packages/block-library/src/social-link/icons/meetup.js | 3 +-- packages/block-library/src/social-link/icons/pinterest.js | 3 +-- packages/block-library/src/social-link/icons/pocket.js | 3 +-- packages/block-library/src/social-link/icons/reddit.js | 3 +-- packages/block-library/src/social-link/icons/skype.js | 3 +-- packages/block-library/src/social-link/icons/snapchat.js | 3 +-- packages/block-library/src/social-link/icons/soundcloud.js | 3 +-- packages/block-library/src/social-link/icons/spotify.js | 3 +-- packages/block-library/src/social-link/icons/tumblr.js | 3 +-- packages/block-library/src/social-link/icons/twitch.js | 3 +-- packages/block-library/src/social-link/icons/twitter.js | 3 +-- packages/block-library/src/social-link/icons/vimeo.js | 3 +-- packages/block-library/src/social-link/icons/vk.js | 3 +-- packages/block-library/src/social-link/icons/wordpress.js | 3 +-- packages/block-library/src/social-link/icons/yelp.js | 3 +-- packages/block-library/src/social-link/icons/youtube.js | 3 +-- 40 files changed, 40 insertions(+), 77 deletions(-) diff --git a/packages/block-library/package.json b/packages/block-library/package.json index 1a99a38df771fb..9f040c95070518 100644 --- a/packages/block-library/package.json +++ b/packages/block-library/package.json @@ -45,6 +45,7 @@ "@wordpress/icons": "file:../icons", "@wordpress/is-shallow-equal": "file:../is-shallow-equal", "@wordpress/keycodes": "file:../keycodes", + "@wordpress/primitives": "file:../primitives", "@wordpress/rich-text": "file:../rich-text", "@wordpress/server-side-render": "file:../server-side-render", "@wordpress/url": "file:../url", diff --git a/packages/block-library/src/social-link/icons/amazon.js b/packages/block-library/src/social-link/icons/amazon.js index bac1ca6a7ddd6b..928c9722ed1d86 100644 --- a/packages/block-library/src/social-link/icons/amazon.js +++ b/packages/block-library/src/social-link/icons/amazon.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const AmazonIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/bandcamp.js b/packages/block-library/src/social-link/icons/bandcamp.js index e9c80c2a13656e..793a314d36f4b3 100644 --- a/packages/block-library/src/social-link/icons/bandcamp.js +++ b/packages/block-library/src/social-link/icons/bandcamp.js @@ -2,7 +2,7 @@ * WordPress dependencies */ -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const BandcampIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/behance.js b/packages/block-library/src/social-link/icons/behance.js index 65097726167d66..e45cdda50336ee 100644 --- a/packages/block-library/src/social-link/icons/behance.js +++ b/packages/block-library/src/social-link/icons/behance.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const BehanceIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/chain.js b/packages/block-library/src/social-link/icons/chain.js index 676269b0a9ff4b..a1285ba053c710 100644 --- a/packages/block-library/src/social-link/icons/chain.js +++ b/packages/block-library/src/social-link/icons/chain.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const ChainIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/codepen.js b/packages/block-library/src/social-link/icons/codepen.js index 8ea31018ab2d76..59bae6fc33e881 100644 --- a/packages/block-library/src/social-link/icons/codepen.js +++ b/packages/block-library/src/social-link/icons/codepen.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const CodepenIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/deviantart.js b/packages/block-library/src/social-link/icons/deviantart.js index 4cf01fdeed0281..901d989433b02c 100644 --- a/packages/block-library/src/social-link/icons/deviantart.js +++ b/packages/block-library/src/social-link/icons/deviantart.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const DeviantArtIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/dribbble.js b/packages/block-library/src/social-link/icons/dribbble.js index ec250898473c6a..56b8d34ac63921 100644 --- a/packages/block-library/src/social-link/icons/dribbble.js +++ b/packages/block-library/src/social-link/icons/dribbble.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const DribbbleIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/dropbox.js b/packages/block-library/src/social-link/icons/dropbox.js index e0de4bda6d2318..e1970ae73172a9 100644 --- a/packages/block-library/src/social-link/icons/dropbox.js +++ b/packages/block-library/src/social-link/icons/dropbox.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const DropboxIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/etsy.js b/packages/block-library/src/social-link/icons/etsy.js index d691d9dca09eb1..2e0712334286a5 100644 --- a/packages/block-library/src/social-link/icons/etsy.js +++ b/packages/block-library/src/social-link/icons/etsy.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const EtsyIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/facebook.js b/packages/block-library/src/social-link/icons/facebook.js index 77343d7e9d1ad3..1219552a6df713 100644 --- a/packages/block-library/src/social-link/icons/facebook.js +++ b/packages/block-library/src/social-link/icons/facebook.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const FacebookIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/feed.js b/packages/block-library/src/social-link/icons/feed.js index e3521f3d13b197..92d4a1001c853c 100644 --- a/packages/block-library/src/social-link/icons/feed.js +++ b/packages/block-library/src/social-link/icons/feed.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const FeedIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/fivehundredpx.js b/packages/block-library/src/social-link/icons/fivehundredpx.js index 6b0111eaeb7d92..a3f30412e39a69 100644 --- a/packages/block-library/src/social-link/icons/fivehundredpx.js +++ b/packages/block-library/src/social-link/icons/fivehundredpx.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const FivehundredpxIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/flickr.js b/packages/block-library/src/social-link/icons/flickr.js index a9d21c2c300f9e..7716d7d868168f 100644 --- a/packages/block-library/src/social-link/icons/flickr.js +++ b/packages/block-library/src/social-link/icons/flickr.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const FlickrIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/foursquare.js b/packages/block-library/src/social-link/icons/foursquare.js index dbd91521a4e740..ba1cacdf29f731 100644 --- a/packages/block-library/src/social-link/icons/foursquare.js +++ b/packages/block-library/src/social-link/icons/foursquare.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const FoursquareIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/github.js b/packages/block-library/src/social-link/icons/github.js index 9f9e1d1e98f25d..6b22e5a05f6cf7 100644 --- a/packages/block-library/src/social-link/icons/github.js +++ b/packages/block-library/src/social-link/icons/github.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const GitHubIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/goodreads.js b/packages/block-library/src/social-link/icons/goodreads.js index 2a9374bc2f781b..8324a9f4c54ae6 100644 --- a/packages/block-library/src/social-link/icons/goodreads.js +++ b/packages/block-library/src/social-link/icons/goodreads.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const GoodreadsIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/google.js b/packages/block-library/src/social-link/icons/google.js index 336e8924ae7852..10ede42a16ed7a 100644 --- a/packages/block-library/src/social-link/icons/google.js +++ b/packages/block-library/src/social-link/icons/google.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const GoogleIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/instagram.js b/packages/block-library/src/social-link/icons/instagram.js index 39c2fc7ba3b09b..9ff7b18d2d5170 100644 --- a/packages/block-library/src/social-link/icons/instagram.js +++ b/packages/block-library/src/social-link/icons/instagram.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const InstagramIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/lastfm.js b/packages/block-library/src/social-link/icons/lastfm.js index aa3e5d9f279ee7..c27562ec85f6fd 100644 --- a/packages/block-library/src/social-link/icons/lastfm.js +++ b/packages/block-library/src/social-link/icons/lastfm.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const LastfmIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/linkedin.js b/packages/block-library/src/social-link/icons/linkedin.js index b4afc099625375..21cdd0ac93101f 100644 --- a/packages/block-library/src/social-link/icons/linkedin.js +++ b/packages/block-library/src/social-link/icons/linkedin.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const LinkedInIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/mail.js b/packages/block-library/src/social-link/icons/mail.js index ab43f106adca94..7752dc1f60079e 100644 --- a/packages/block-library/src/social-link/icons/mail.js +++ b/packages/block-library/src/social-link/icons/mail.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const MailIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/mastodon.js b/packages/block-library/src/social-link/icons/mastodon.js index 5ee0ed256a2641..add394cc085230 100644 --- a/packages/block-library/src/social-link/icons/mastodon.js +++ b/packages/block-library/src/social-link/icons/mastodon.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const MastodonIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/medium.js b/packages/block-library/src/social-link/icons/medium.js index 4cf5b265398d89..88de49e65be046 100644 --- a/packages/block-library/src/social-link/icons/medium.js +++ b/packages/block-library/src/social-link/icons/medium.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const MediumIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/meetup.js b/packages/block-library/src/social-link/icons/meetup.js index 8f12e1566ce970..c7c9ddf44e7193 100644 --- a/packages/block-library/src/social-link/icons/meetup.js +++ b/packages/block-library/src/social-link/icons/meetup.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const MeetupIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/pinterest.js b/packages/block-library/src/social-link/icons/pinterest.js index 70782c6189f81c..97bcba825db3ce 100644 --- a/packages/block-library/src/social-link/icons/pinterest.js +++ b/packages/block-library/src/social-link/icons/pinterest.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const PinterestIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/pocket.js b/packages/block-library/src/social-link/icons/pocket.js index 43f3661cd201d1..564335384c4d70 100644 --- a/packages/block-library/src/social-link/icons/pocket.js +++ b/packages/block-library/src/social-link/icons/pocket.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const PocketIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/reddit.js b/packages/block-library/src/social-link/icons/reddit.js index 9a17f0a19a1bfa..d0b8437df58d58 100644 --- a/packages/block-library/src/social-link/icons/reddit.js +++ b/packages/block-library/src/social-link/icons/reddit.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const RedditIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/skype.js b/packages/block-library/src/social-link/icons/skype.js index 4dc946541a83f6..2544f2559faaf1 100644 --- a/packages/block-library/src/social-link/icons/skype.js +++ b/packages/block-library/src/social-link/icons/skype.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const SkypeIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/snapchat.js b/packages/block-library/src/social-link/icons/snapchat.js index 73f93ee6279289..825ea99842ba9e 100644 --- a/packages/block-library/src/social-link/icons/snapchat.js +++ b/packages/block-library/src/social-link/icons/snapchat.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const SnapchatIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/soundcloud.js b/packages/block-library/src/social-link/icons/soundcloud.js index 538d1f867d4191..ffc740aae1a077 100644 --- a/packages/block-library/src/social-link/icons/soundcloud.js +++ b/packages/block-library/src/social-link/icons/soundcloud.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const SoundCloudIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/spotify.js b/packages/block-library/src/social-link/icons/spotify.js index 03256e1b31e048..63d2ddadc77e9a 100644 --- a/packages/block-library/src/social-link/icons/spotify.js +++ b/packages/block-library/src/social-link/icons/spotify.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const SpotifyIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/tumblr.js b/packages/block-library/src/social-link/icons/tumblr.js index 946f7e1b040de0..5999fe4ead681d 100644 --- a/packages/block-library/src/social-link/icons/tumblr.js +++ b/packages/block-library/src/social-link/icons/tumblr.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const TumblrIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/twitch.js b/packages/block-library/src/social-link/icons/twitch.js index 6bbbc13b2a4358..1d6691e28995e1 100644 --- a/packages/block-library/src/social-link/icons/twitch.js +++ b/packages/block-library/src/social-link/icons/twitch.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const TwitchIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/twitter.js b/packages/block-library/src/social-link/icons/twitter.js index 95e7435c6176e8..eda1a53f7f2be0 100644 --- a/packages/block-library/src/social-link/icons/twitter.js +++ b/packages/block-library/src/social-link/icons/twitter.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const TwitterIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/vimeo.js b/packages/block-library/src/social-link/icons/vimeo.js index 1e11bda150ed44..fd8b29f45db997 100644 --- a/packages/block-library/src/social-link/icons/vimeo.js +++ b/packages/block-library/src/social-link/icons/vimeo.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const VimeoIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/vk.js b/packages/block-library/src/social-link/icons/vk.js index 97ac09e842fe1b..d877d28b577059 100644 --- a/packages/block-library/src/social-link/icons/vk.js +++ b/packages/block-library/src/social-link/icons/vk.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const VkIcon = () => ( diff --git a/packages/block-library/src/social-link/icons/wordpress.js b/packages/block-library/src/social-link/icons/wordpress.js index 0fc780d08954ef..2a51d200bc871b 100644 --- a/packages/block-library/src/social-link/icons/wordpress.js +++ b/packages/block-library/src/social-link/icons/wordpress.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const WordPressIcon = () => ( ( diff --git a/packages/block-library/src/social-link/icons/youtube.js b/packages/block-library/src/social-link/icons/youtube.js index 7256a177262f7e..e788d6e8d6ceeb 100644 --- a/packages/block-library/src/social-link/icons/youtube.js +++ b/packages/block-library/src/social-link/icons/youtube.js @@ -1,8 +1,7 @@ /** * WordPress dependencies */ - -import { Path, SVG } from '@wordpress/components'; +import { Path, SVG } from '@wordpress/primitives'; export const YouTubeIcon = () => ( From 523cf97f93b3f92464c08ca8c85e1246272d6cc6 Mon Sep 17 00:00:00 2001 From: Marcus Kazmierczak Date: Fri, 24 Jan 2020 11:02:29 -0800 Subject: [PATCH 2/2] package-lock --- package-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-lock.json b/package-lock.json index 1d5a493bf8e4e8..d4aafd3e7753b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10123,6 +10123,7 @@ "@wordpress/icons": "file:packages/icons", "@wordpress/is-shallow-equal": "file:packages/is-shallow-equal", "@wordpress/keycodes": "file:packages/keycodes", + "@wordpress/primitives": "file:packages/primitives", "@wordpress/rich-text": "file:packages/rich-text", "@wordpress/server-side-render": "file:packages/server-side-render", "@wordpress/url": "file:packages/url",