From 8d100809cfe1511732453ff9b57f8c2a2b69ef7b Mon Sep 17 00:00:00 2001 From: Trevor <7311041+tjuanitas@users.noreply.github.com> Date: Tue, 7 Jul 2026 16:10:35 -0700 Subject: [PATCH 1/4] feat(typography): BREAKING CHANGE support inter font (#4676) * feat: support inter font * refactor: update variables * refactor: remove redundant mixins * revert: format * fix: unit test * fix: rules * fix: content picker * fix: content uploader * fix: apply styles to body --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .storybook/preview-head.html | 14 +++++++++ .../category-selector/CategorySelector.scss | 2 +- .../dropdown-menu/DropdownMenu.scss | 2 +- .../DraftTimestamp.scss | 2 +- src/components/label-pill/LabelPill.scss | 2 +- .../pill-selector-dropdown/RoundPill.scss | 2 +- src/components/tooltip/Tooltip.scss | 2 +- src/elements/common/_variables.scss | 17 +++------- src/elements/common/fonts.scss | 14 +++++++++ src/elements/common/item/ItemName.scss | 1 + src/elements/common/item/NameCell.scss | 3 +- .../content-open-with/ContentOpenWith.scss | 2 +- .../activity-feed/comment/BaseComment.scss | 2 +- .../comment/components/BaseCommentInfo.scss | 2 +- .../activity-message/ActivityMessage.scss | 2 +- src/elements/content-uploader/IconName.scss | 2 +- .../CollapsibleSidebar.scss | 2 +- .../content-explorer/ContentExplorer.scss | 2 +- .../ContentAnalyticsErrorState.scss | 2 +- src/features/content-insights/_mixins.scss | 2 +- .../sandbox-banner/SandboxBanner.scss | 2 +- src/styles/common/_buttons.scss | 2 +- src/styles/common/_typography.scss | 5 +-- src/styles/constants/_typography.scss | 14 ++------- src/styles/mixins/_buttons.scss | 2 +- src/styles/mixins/_typography.scss | 31 ++++++++++++++++--- src/styles/variables.js | 6 ++-- src/styles/variables.json | 6 ++-- src/styles/variables.ts | 6 ++-- 29 files changed, 94 insertions(+), 59 deletions(-) diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index eef89da5c3..518279c144 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -26,3 +26,17 @@ type="font/woff2" crossorigin="anonymous" /> + + diff --git a/src/components/category-selector/CategorySelector.scss b/src/components/category-selector/CategorySelector.scss index caaf099642..85f19a8171 100644 --- a/src/components/category-selector/CategorySelector.scss +++ b/src/components/category-selector/CategorySelector.scss @@ -17,7 +17,7 @@ height: 8 * $bdl-grid-unit; padding: 2 * $bdl-grid-unit 4 * $bdl-grid-unit; font-weight: bold; - font-size: $bdl-fontSize; + font-size: $bdl-fontSize--legacy; line-height: 4 * $bdl-grid-unit; white-space: nowrap; text-align: center; diff --git a/src/components/dropdown-menu/DropdownMenu.scss b/src/components/dropdown-menu/DropdownMenu.scss index e9ac1a327b..a59bc703a3 100644 --- a/src/components/dropdown-menu/DropdownMenu.scss +++ b/src/components/dropdown-menu/DropdownMenu.scss @@ -13,7 +13,7 @@ // menu needs to manually inherit few of the body styles to look correct. .dropdown-menu-element { @include box-sizing; - @include bdl-commonTypography-dejaBlue; + @include bdl-commonTypography; z-index: $menu-z-index; margin-top: 5px; diff --git a/src/components/form-elements/draft-js-mention-selector/DraftTimestamp.scss b/src/components/form-elements/draft-js-mention-selector/DraftTimestamp.scss index 8a9dfdc9dd..e3cbe173f9 100644 --- a/src/components/form-elements/draft-js-mention-selector/DraftTimestamp.scss +++ b/src/components/form-elements/draft-js-mention-selector/DraftTimestamp.scss @@ -2,7 +2,7 @@ .bcs-CommentTimestamp-entity { color: var(--box-blue-110, #0057c0); - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; line-height: $bdl-line-height; border-radius: $bdl-border-radius-size; background-color: $bdl-box-blue-10; diff --git a/src/components/label-pill/LabelPill.scss b/src/components/label-pill/LabelPill.scss index 642818479e..d6019734d5 100644 --- a/src/components/label-pill/LabelPill.scss +++ b/src/components/label-pill/LabelPill.scss @@ -14,7 +14,7 @@ .bdl-LabelPill--sizeLarge { padding: $bdl-grid-unit; - font-size: $bdl-fontSize; + font-size: $bdl-fontSize--legacy; line-height: $bdl-line-height; border-radius: $bdl-line-height; } diff --git a/src/components/pill-selector-dropdown/RoundPill.scss b/src/components/pill-selector-dropdown/RoundPill.scss index b9a6a57745..1ab81cde56 100644 --- a/src/components/pill-selector-dropdown/RoundPill.scss +++ b/src/components/pill-selector-dropdown/RoundPill.scss @@ -21,7 +21,7 @@ margin: 0 $bdl-grid-unit * 2 !important; padding-top: 1px; // offset for aligning "average" string that doesn't have descender chars overflow: hidden; - line-height: $bdl-fontSize + $bdl-grid-unit; // for vertical centering using flex; + line-height: $bdl-fontSize--legacy + $bdl-grid-unit; // for vertical centering using flex; white-space: nowrap; text-overflow: ellipsis; } diff --git a/src/components/tooltip/Tooltip.scss b/src/components/tooltip/Tooltip.scss index e31e25c550..f8f1b7395d 100644 --- a/src/components/tooltip/Tooltip.scss +++ b/src/components/tooltip/Tooltip.scss @@ -13,7 +13,7 @@ $tooltip-offset: 4px; /* amount of space between target and tooltip arrow */ max-width: 200px; padding: $bdl-grid-unit * 2 $horizontal-offset; color: $white; - font-size: $bdl-fontSize; + font-size: $bdl-fontSize--legacy; line-height: 1.4; word-wrap: break-word; background-color: $bdl-gray-80; diff --git a/src/elements/common/_variables.scss b/src/elements/common/_variables.scss index e9c843e5ad..88daf4f8c0 100644 --- a/src/elements/common/_variables.scss +++ b/src/elements/common/_variables.scss @@ -1,7 +1,6 @@ @import '../../styles/variables'; @import '../../styles/inputs'; -$font: lato, 'Helvetica Neue', helvetica, arial, sans-serif; $minimumWidth: 300px; $sidebarHeaderHeight: 60px; $sidebarSubHeaderHeight: 56px; @@ -13,23 +12,15 @@ $sidebarActivityFeedSpacingVertical: 20px; $sidebarActivityFeedSelectedItemSpacing: 10px; $sidebarTabResponsiveSize: 48px; -@mixin rendering { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-rendering: optimizelegibility; -} - @mixin reset { - @include rendering; + @include bdl-fonts; /* stylelint-disable declaration-no-important */ box-sizing: border-box !important; - font-size: 13px; /* stylelint-enable declaration-no-important */ - font-family: $font; * { - @include rendering; + @include font-aliasing; /* stylelint-disable declaration-no-important */ box-sizing: border-box !important; @@ -47,9 +38,9 @@ $sidebarTabResponsiveSize: 48px; } @mixin placeholder { + @include bdl-fonts; + color: $bdl-gray-65; - font-weight: normal; - font-family: $font; // Firefox sets opacity for placeholder to less than 100% // See https://developer.mozilla.org/en-US/docs/Web/CSS/::placeholder#opaque_text diff --git a/src/elements/common/fonts.scss b/src/elements/common/fonts.scss index 64706211c5..d0cfd9df53 100644 --- a/src/elements/common/fonts.scss +++ b/src/elements/common/fonts.scss @@ -19,3 +19,17 @@ url('https://cdn01.boxcdn.net/fonts/1.0.17/lato/Lato-Bold.woff2') format('woff2'), url('https://cdn01.boxcdn.net/fonts/1.0.17/lato/Lato-Bold.woff') format('woff'); } + +@font-face { + font-weight: 100 900; + font-family: InterVariable; + font-style: normal; + src: url('https://cdn01.boxcdn.net/fonts/1.0.18-beta.4/inter/InterVariable.woff2') format('woff2'); +} + +@font-face { + font-weight: 100 900; + font-family: InterVariable; + font-style: italic; + src: url('https://cdn01.boxcdn.net/fonts/1.0.18-beta.4/inter/InterVariable-Italic.woff2') format('woff2'); +} diff --git a/src/elements/common/item/ItemName.scss b/src/elements/common/item/ItemName.scss index d18f66d38f..43e2db8f6d 100644 --- a/src/elements/common/item/ItemName.scss +++ b/src/elements/common/item/ItemName.scss @@ -3,6 +3,7 @@ .be-item-label { display: block; width: 100%; + padding: 0; overflow: hidden; color: var(--gray-black); white-space: nowrap; diff --git a/src/elements/common/item/NameCell.scss b/src/elements/common/item/NameCell.scss index 1e71a344b9..17f697356f 100644 --- a/src/elements/common/item/NameCell.scss +++ b/src/elements/common/item/NameCell.scss @@ -2,7 +2,8 @@ .be-item-name { overflow: hidden; - line-height: 15px; + font-size: $bdl-fontSize--legacy; + line-height: 16px; white-space: normal; text-align: left; text-overflow: ellipsis; diff --git a/src/elements/content-open-with/ContentOpenWith.scss b/src/elements/content-open-with/ContentOpenWith.scss index 4eabb2b6c5..ada01f8bd2 100644 --- a/src/elements/content-open-with/ContentOpenWith.scss +++ b/src/elements/content-open-with/ContentOpenWith.scss @@ -1,7 +1,7 @@ @import '../common/variables'; .be.bcow { - font-family: $font; + @include font-family; .btn { padding: 3px 13px 3px 10px; diff --git a/src/elements/content-sidebar/activity-feed/comment/BaseComment.scss b/src/elements/content-sidebar/activity-feed/comment/BaseComment.scss index f08bd830d6..3a7274308a 100644 --- a/src/elements/content-sidebar/activity-feed/comment/BaseComment.scss +++ b/src/elements/content-sidebar/activity-feed/comment/BaseComment.scss @@ -3,7 +3,7 @@ $repliesPaddingLeft: 40px; .bcs-BaseComment { - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; .bcs-CommentForm-input { background-color: $white; diff --git a/src/elements/content-sidebar/activity-feed/comment/components/BaseCommentInfo.scss b/src/elements/content-sidebar/activity-feed/comment/components/BaseCommentInfo.scss index c0102c26ce..77428210d3 100644 --- a/src/elements/content-sidebar/activity-feed/comment/components/BaseCommentInfo.scss +++ b/src/elements/content-sidebar/activity-feed/comment/components/BaseCommentInfo.scss @@ -5,7 +5,7 @@ align-items: 'bottom'; justify-content: flex-start; padding: 2; - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; .bdl-Media-figure { line-height: 0; diff --git a/src/elements/content-sidebar/activity-feed/common/activity-message/ActivityMessage.scss b/src/elements/content-sidebar/activity-feed/common/activity-message/ActivityMessage.scss index 05dc39f965..c15e3233e9 100644 --- a/src/elements/content-sidebar/activity-feed/common/activity-message/ActivityMessage.scss +++ b/src/elements/content-sidebar/activity-feed/common/activity-message/ActivityMessage.scss @@ -18,7 +18,7 @@ button { color: var(--box-blue-110, #0057c0); - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; line-height: $bdl-line-height; border-radius: $bdl-border-radius-size; background-color: $bdl-box-blue-10; diff --git a/src/elements/content-uploader/IconName.scss b/src/elements/content-uploader/IconName.scss index 987d970080..18457fbfa1 100644 --- a/src/elements/content-uploader/IconName.scss +++ b/src/elements/content-uploader/IconName.scss @@ -21,7 +21,7 @@ align-items: flex-start; justify-content: center; overflow: hidden; - line-height: 15px; + font-size: $bdl-fontSize--legacy; text-align: left; } diff --git a/src/features/collapsible-sidebar/CollapsibleSidebar.scss b/src/features/collapsible-sidebar/CollapsibleSidebar.scss index 960c86b30d..5414747bbe 100644 --- a/src/features/collapsible-sidebar/CollapsibleSidebar.scss +++ b/src/features/collapsible-sidebar/CollapsibleSidebar.scss @@ -29,7 +29,7 @@ $left-sidebar-z-index: 40 !default; max-height: 100%; padding: 0; color: $white; - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; letter-spacing: 0.3px; background: $bdl-box-blue; backface-visibility: hidden; diff --git a/src/features/content-explorer/content-explorer/ContentExplorer.scss b/src/features/content-explorer/content-explorer/ContentExplorer.scss index afb0b5ce21..9659e8feeb 100644 --- a/src/features/content-explorer/content-explorer/ContentExplorer.scss +++ b/src/features/content-explorer/content-explorer/ContentExplorer.scss @@ -152,7 +152,7 @@ left: 0; margin-top: 5px; color: $bdl-box-blue; - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; line-height: $bdl-line-height; } diff --git a/src/features/content-insights/ContentAnalyticsErrorState.scss b/src/features/content-insights/ContentAnalyticsErrorState.scss index c4ab9135f3..2a17c33dde 100644 --- a/src/features/content-insights/ContentAnalyticsErrorState.scss +++ b/src/features/content-insights/ContentAnalyticsErrorState.scss @@ -12,6 +12,6 @@ .ContentAnalyticsErrorState-text--permission { width: 100%; margin-top: $bdl-grid-unit * 5; - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; text-align: center; } diff --git a/src/features/content-insights/_mixins.scss b/src/features/content-insights/_mixins.scss index 439b7b4a3c..a3e6d35722 100644 --- a/src/features/content-insights/_mixins.scss +++ b/src/features/content-insights/_mixins.scss @@ -3,5 +3,5 @@ @mixin ContentInsightsHeaderText { color: $bdl-gray-65; font-weight: bold; - font-size: $bdl-fontSize-minimum; + font-size: $bdl-fontSize--minimum; } diff --git a/src/features/sandbox-banner/SandboxBanner.scss b/src/features/sandbox-banner/SandboxBanner.scss index 71cfd61be7..2f01d3e4e7 100644 --- a/src/features/sandbox-banner/SandboxBanner.scss +++ b/src/features/sandbox-banner/SandboxBanner.scss @@ -24,7 +24,7 @@ $sandboxbanner-max-width: 584px; width: 100%; overflow: hidden; color: $white; - font-size: $bdl-fontSize; + font-size: $bdl-fontSize--legacy; white-space: nowrap; text-overflow: ellipsis; } diff --git a/src/styles/common/_buttons.scss b/src/styles/common/_buttons.scss index 639a4d19fe..ad85911fab 100644 --- a/src/styles/common/_buttons.scss +++ b/src/styles/common/_buttons.scss @@ -17,7 +17,7 @@ padding: $bdl-btn-padding-vertical $bdl-btn-padding-horizontal; color: $bdl-gray-80; font-weight: bold; - font-size: $bdl-fontSize; + font-size: $bdl-fontSize--legacy; line-height: $bdl-btn-height - 2 * $bdl-btn-border-width - 2 * $bdl-btn-padding-vertical; letter-spacing: 0.035em; white-space: nowrap; diff --git a/src/styles/common/_typography.scss b/src/styles/common/_typography.scss index ec8694d387..bacc42a1b4 100644 --- a/src/styles/common/_typography.scss +++ b/src/styles/common/_typography.scss @@ -19,8 +19,9 @@ body { @include common-typography; } -body.is-deja-blue { - @include bdl-commonTypography-dejaBlue; +body.is-deja-blue, +body.is-inter-font { + @include bdl-commonTypography; } p { diff --git a/src/styles/constants/_typography.scss b/src/styles/constants/_typography.scss index 9d8bde6150..6a2c6b3c99 100644 --- a/src/styles/constants/_typography.scss +++ b/src/styles/constants/_typography.scss @@ -1,14 +1,6 @@ $bdl-line-height: 20px; // Font sizes -$bdl-fontSize: 13px; -$bdl-fontSize-minimum: 11px; -$bdl-fontSize--dejaBlue: 14px; - -// "--dejaBlue" size will become default at some point -// Migration Steps: -// 1. New or restyled code should use --dejaBlue variable -// 2. Find any hardcoded font sizes and change to use variables -// 3. Once most components are DJB styled, change bdl-fontSize to 14px -// 4. Fix any issues with components due to change of base variable -// 5. Replace all references to $bdl-fontSize--dejaBlue with $bdl-fontSize and delete --dejaBlue +$bdl-fontSize: 14px; +$bdl-fontSize--legacy: 13px; +$bdl-fontSize--minimum: 11px; diff --git a/src/styles/mixins/_buttons.scss b/src/styles/mixins/_buttons.scss index d847df646f..bd4d617164 100644 --- a/src/styles/mixins/_buttons.scss +++ b/src/styles/mixins/_buttons.scss @@ -18,6 +18,6 @@ */ @mixin bdl-Button--large { padding: 0 $bdl-btn-padding-horizontal; - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; line-height: $bdl-btn-height-large - 2 * $bdl-btn-border-width; } diff --git a/src/styles/mixins/_typography.scss b/src/styles/mixins/_typography.scss index 1349ffdcaa..0a8991aca0 100644 --- a/src/styles/mixins/_typography.scss +++ b/src/styles/mixins/_typography.scss @@ -3,6 +3,13 @@ @mixin font-family { font-family: Lato, 'Helvetica Neue', Helvetica, Arial, sans-serif; + + @at-root { + &:where(body.is-inter-font), + :where(body.is-inter-font) & { + font-family: InterVariable, 'Helvetica Neue', Helvetica, Arial, sans-serif; + } + } } @mixin font-aliasing { @@ -16,15 +23,22 @@ @include font-aliasing; font-weight: normal; - font-size: $bdl-fontSize; + font-size: $bdl-fontSize--legacy; } -@mixin bdl-fonts-dejaBlue { +@mixin bdl-fonts { @include font-family; @include font-aliasing; font-weight: normal; - font-size: $bdl-fontSize--dejaBlue; + font-size: $bdl-fontSize; + + @at-root { + &:where(body.is-inter-font), + :where(body.is-inter-font) & { + font-weight: 450; + } + } } @mixin common-typography { @@ -35,12 +49,19 @@ letter-spacing: 0.3px; } -@mixin bdl-commonTypography-dejaBlue { - @include bdl-fonts-dejaBlue; +@mixin bdl-commonTypography { + @include bdl-fonts; color: $bdl-gray; line-height: $bdl-line-height; letter-spacing: 0.3px; + + @at-root { + &:where(body.is-inter-font), + :where(body.is-inter-font) & { + letter-spacing: 0; + } + } } @mixin bdl-targetIE11 { diff --git a/src/styles/variables.js b/src/styles/variables.js index a6cac985c3..5ef559c7af 100644 --- a/src/styles/variables.js +++ b/src/styles/variables.js @@ -79,9 +79,9 @@ export const bdlWatermelonRed10 = "#fdebee"; // bdl-watermelon-red-10 export const bdlWatermelonRed05 = "#fef5f6"; // bdl-watermelon-red-05 export const bdlWatermelonRed02 = "#fffbfc"; // bdl-watermelon-red-02 export const bdlLineHeight = "20px"; // bdl-line-height -export const bdlFontSize = "13px"; // bdl-fontSize -export const bdlFontSizeMinimum = "11px"; // bdl-fontSize-minimum -export const bdlFontSizeDejaBlue = "14px"; // bdl-fontSize--dejaBlue +export const bdlFontSize = "14px"; // bdl-fontSize +export const bdlFontSizeLegacy = "13px"; // bdl-fontSize--legacy +export const bdlFontSizeMinimum = "11px"; // bdl-fontSize--minimum export const avatarColors = ["#0061d5","#003c84","#6f6f6f","#222","#4826c2","#9f3fed"]; // avatar-colors export const modalDialogZIndex = "160"; // modal-dialog-z-index export const menuZIndex = "170"; // menu-z-index diff --git a/src/styles/variables.json b/src/styles/variables.json index a725da3756..cf6b238667 100644 --- a/src/styles/variables.json +++ b/src/styles/variables.json @@ -76,9 +76,9 @@ "bdl-watermelon-red-05": "#fef5f6", "bdl-watermelon-red-02": "#fffbfc", "bdl-line-height": "20px", - "bdl-fontSize": "13px", - "bdl-fontSize-minimum": "11px", - "bdl-fontSize--dejaBlue": "14px", + "bdl-fontSize": "14px", + "bdl-fontSize--legacy": "13px", + "bdl-fontSize--minimum": "11px", "avatar-colors": ["#0061d5", "#003c84", "#6f6f6f", "#222", "#4826c2", "#9f3fed"], "modal-dialog-z-index": "160", "menu-z-index": "170", diff --git a/src/styles/variables.ts b/src/styles/variables.ts index 09593a05f0..8c764838a7 100644 --- a/src/styles/variables.ts +++ b/src/styles/variables.ts @@ -76,9 +76,9 @@ export const bdlWatermelonRed10 = '#fdebee'; // bdl-watermelon-red-10 export const bdlWatermelonRed05 = '#fef5f6'; // bdl-watermelon-red-05 export const bdlWatermelonRed02 = '#fffbfc'; // bdl-watermelon-red-02 export const bdlLineHeight = '20px'; // bdl-line-height -export const bdlFontSize = '13px'; // bdl-fontSize -export const bdlFontSizeMinimum = '11px'; // bdl-fontSize-minimum -export const bdlFontSizeDejaBlue = '14px'; // bdl-fontSize--dejaBlue +export const bdlFontSize = '14px'; // bdl-fontSize +export const bdlFontSizeLegacy = '13px'; // bdl-fontSize--legacy +export const bdlFontSizeMinimum = '11px'; // bdl-fontSize--minimum export const avatarColors = ['#0061d5', '#003c84', '#6f6f6f', '#222', '#4826c2', '#9f3fed']; // avatar-colors export const modalDialogZIndex = '160'; // modal-dialog-z-index export const menuZIndex = '170'; // menu-z-index From 4ab8866d06437059b5e05fc1ca2130ef5790bbad Mon Sep 17 00:00:00 2001 From: Jerry Jiang Date: Wed, 8 Jul 2026 17:21:21 -0500 Subject: [PATCH 2/4] feat(font): update inter asset version (#4681) --- .storybook/preview-head.html | 4 ++-- src/elements/common/fonts.scss | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index 518279c144..925bc6f904 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -28,14 +28,14 @@ /> Date: Tue, 4 Aug 2026 11:39:00 -0500 Subject: [PATCH 3/4] feat(fonts): Update font version (#4740) * feat(fonts): update font assets version Co-authored-by: Cursor * feat(fonts): update css for inter font * feat(fonts): update font family in typography --------- Co-authored-by: Cursor Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .storybook/preview-head.html | 4 ++-- src/elements/common/fonts.scss | 8 ++++---- src/styles/mixins/_typography.scss | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index 925bc6f904..f87be1156c 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -28,14 +28,14 @@ /> Date: Wed, 5 Aug 2026 14:45:18 -0700 Subject: [PATCH 4/4] chore: update release scripts --- package.json | 2 +- scripts/cut_release.sh | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 34bcc189e9..6cc50611e9 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "lint:css": "stylelint \"src/**/*.scss\"", "prebuild:es": "npm-run-all copy:styles ts:defs copy:flow", "release": "yarn release:beta", - "release:beta": "DIST=beta BRANCH=master scripts/release.sh", + "release:beta": "DIST=beta BRANCH=v25.6.0-beta.1 scripts/release.sh", "release:hotfix": "DIST=latest HOTFIX=true scripts/release.sh", "release:latest": "DIST=latest BRANCH=master scripts/release.sh", "release:next": "DIST=next BRANCH=next scripts/release.sh", diff --git a/scripts/cut_release.sh b/scripts/cut_release.sh index 911e6b4dab..2dba5d2a32 100755 --- a/scripts/cut_release.sh +++ b/scripts/cut_release.sh @@ -250,11 +250,8 @@ push_new_release() { # Check untracked files check_untracked_files || return 1 - # Run the release - if ! HUSKY_SKIP_HOOKS=1 BRANCH=$BRANCH DIST=$DIST yarn semantic-release --no-ci; then - printf "${red}Failed semantic release!${end}" - return 1 - fi + npm version 25.6.0-beta.1 --no-git-tag-version + yarn prettier --write --parser=json package.json # Get the latest version from uncommitted package.json VERSION=$(source ./scripts/version.sh)