rebuild ponyfill after rebase

blockbase/sass/blocks/_button-mixins.scss

@@ -1,6 +1,6 @@
 // NOTE: These remain for the styling of buttons that are NOT blocks and is used elsewhere.  This can be removed when those no longer exist.
 // See https://github.com/WordPress/gutenberg/issues/29167
-//We are keeping the mixin in case it's used by any child themes, but this isn't used by Blockbase any more
+// We are keeping the mixin in case it's used by any child themes, but this isn't used by Blockbase any more
 @mixin button-main-styles {
 
 	@include button-padding-styles;
@@ -14,7 +14,6 @@
 	color: var(--wp--custom--button--color--text);
 	background-color: var(--wp--custom--button--color--background);
 	border-color: currentcolor;
-	border-color: currentcolor;
 
 	svg {
 		fill: var(--wp--custom--button--color--text);

blockbase/sass/blocks/_button.scss

@@ -1,44 +1,3 @@
-@import "button-mixins";
-
-/**
- * Button
- */
-
-/**
- * Block Options
- */
-.wp-block-button,
-.wp-block-button__link {
-
-	&.wp-block-button__link,
-	.wp-block-button__link {
-
-		@include button-hover-styles;
-		border-width: 0;
-		text-decoration: none;
-		font-weight: var(--wp--custom--button--typography--font-weight);
-	}
-
-	&.is-style-outline {
-
-		&.wp-block-button__link,
-		.wp-block-button__link {
-			--wp--custom--button--color--text: var(--wp--custom--button--border--color);
-			--wp--custom--button--color--background: transparent;
-
-			@include button-border-styles;
-			@include button-hover-styles;
-			@include button-color-styles;
-		}
-	}
-}
-
-// TODO: I'm not sure what the end goal should be here, but since we are unable to use
-// a button block OUTSIDE of the context of the button collection block (grrrrrrrrr)
-// then there are undesired margins to be dealt with somehow.
-.wp-block-buttons {
-
-	.wp-block-button:last-child {
-		margin-bottom: 0;
-	}
+.wp-block-button:not(.is-style-outline) > a.has-background {
+	border-style: none;
 }