feat(ThemeProvider): Change font link from google fonts to fonts bunny

Ref: #epic/MainLibrary-0
leemonade · Nov 16, 2023 · eae2ab7 · eae2ab7
1 parent e75bbcf
commit eae2ab7
Show file tree

Hide file tree

Showing 6 changed files with 6,795 additions and 6,992 deletions.
diff --git a/merged_tokens.json b/merged_tokens.json
@@ -6663,6 +6663,10 @@
   },
   "$themes": [],
   "$metadata": {
-    "tokenSetOrder": ["core", "global", "component"]
+    "tokenSetOrder": [
+      "core",
+      "global",
+      "component"
+    ]
   }
-}
+}
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.22.15",
+    "@babel/plugin-transform-export-namespace-from": "^7.23.3",
     "better-spawn": "^1.0.4",
     "chalk": "^4.1.1",
     "chromatic": "^6.11.4",

diff --git a/packages/components/babel.config.js b/packages/components/babel.config.js
@@ -27,7 +27,7 @@ module.exports = {
     '@babel/plugin-syntax-dynamic-import',
     '@babel/plugin-syntax-import-meta',
     // '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-proposal-export-namespace-from',
+    // '@babel/plugin-proposal-export-namespace-from',
     '@babel/plugin-proposal-export-default-from',
   ],
 };
diff --git a/packages/components/src/ThemeProvider.js b/packages/components/src/ThemeProvider.js
@@ -2,9 +2,9 @@ import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { MantineProvider } from '@mantine/core';
 import { Helmet } from 'react-helmet';
+import { isEmpty, isObject } from 'lodash';
 import { COLORS, FONT_SIZES, SPACING, SHADOWS } from './theme.tokens';
 import figmaTokens from './tokens.compiled';
-import { isEmpty, isObject } from 'lodash';
 
 export const BUBBLES_THEME = {
   colorScheme: 'light',
@@ -67,9 +67,9 @@ const ThemeProvider = ({ children, theme }) => {
     <>
       <Helmet>
         <link rel="preconnect" href="https://fonts.googleapis.com" />
-        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+        <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin />
         <link
-          href="https://fonts.googleapis.com/css2?family=Albert+Sans:wght@100;300;400;500;600&display=swap"
+          href="https://fonts.bunny.net/css?family=albert-sans:100,300,400,500,600"
           rel="stylesheet"
         />
       </Helmet>