Merge branch 'main' into feat/tokens

# Conflicts: # .storybook/main.ts # package.json # pnpm-lock.yaml
gsoft-inc · Oct 30, 2023 · 8b31bd9 · 8b31bd9
2 parents 4391190 + 5026ef0
commit 8b31bd9
Show file tree

Hide file tree

Showing 26 changed files with 16 additions and 13 deletions.
diff --git a/packages/tokens/CHANGELOG.md b/packages/tokens/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @hopper-ui/tokens
 
+## 2.0.0
+
+### Major Changes
+
+- 51c5357: replace the relative path of assets by an absolute path
+
 ## 1.1.0
 
 ### Minor Changes

diff --git a/packages/tokens/assets/fonts/ABCFavorit-Bold.otf b/packages/tokens/assets/fonts/ABCFavorit-Bold.otf
diff --git a/packages/tokens/assets/fonts/ABCFavorit-Bold.woff b/packages/tokens/assets/fonts/ABCFavorit-Bold.woff
diff --git a/packages/tokens/assets/fonts/ABCFavorit-Medium.otf b/packages/tokens/assets/fonts/ABCFavorit-Medium.otf
diff --git a/packages/tokens/assets/fonts/ABCFavorit-Medium.woff b/packages/tokens/assets/fonts/ABCFavorit-Medium.woff
diff --git a/packages/tokens/assets/fonts/ABCFavorit-Regular.otf b/packages/tokens/assets/fonts/ABCFavorit-Regular.otf
diff --git a/packages/tokens/assets/fonts/ABCFavorit-Regular.woff b/packages/tokens/assets/fonts/ABCFavorit-Regular.woff
diff --git a/packages/tokens/assets/fonts/ABCFavoritMono-Regular.otf b/packages/tokens/assets/fonts/ABCFavoritMono-Regular.otf
diff --git a/packages/tokens/assets/fonts/ABCFavoritMono-Regular.woff b/packages/tokens/assets/fonts/ABCFavoritMono-Regular.woff
diff --git a/packages/tokens/assets/fonts/Inter-Bold.woff2 b/packages/tokens/assets/fonts/Inter-Bold.woff2
diff --git a/packages/tokens/assets/fonts/Inter-BoldItalic.otf b/packages/tokens/assets/fonts/Inter-BoldItalic.otf
diff --git a/packages/tokens/assets/fonts/Inter-BoldItalic.woff2 b/packages/tokens/assets/fonts/Inter-BoldItalic.woff2
diff --git a/packages/tokens/assets/fonts/Inter-Medium.otf b/packages/tokens/assets/fonts/Inter-Medium.otf
diff --git a/packages/tokens/assets/fonts/Inter-Medium.woff2 b/packages/tokens/assets/fonts/Inter-Medium.woff2
diff --git a/packages/tokens/assets/fonts/Inter-MediumItalic.otf b/packages/tokens/assets/fonts/Inter-MediumItalic.otf
diff --git a/packages/tokens/assets/fonts/Inter-MediumItalic.woff2 b/packages/tokens/assets/fonts/Inter-MediumItalic.woff2
diff --git a/packages/tokens/assets/fonts/Inter-Regular.otf b/packages/tokens/assets/fonts/Inter-Regular.otf
diff --git a/packages/tokens/assets/fonts/Inter-Regular.woff2 b/packages/tokens/assets/fonts/Inter-Regular.woff2
diff --git a/packages/tokens/assets/fonts/Inter-SemiBold.otf b/packages/tokens/assets/fonts/Inter-SemiBold.otf
diff --git a/packages/tokens/assets/fonts/Inter-SemiBold.woff2 b/packages/tokens/assets/fonts/Inter-SemiBold.woff2
diff --git a/packages/tokens/assets/fonts/Inter-SemiBoldItalic.otf b/packages/tokens/assets/fonts/Inter-SemiBoldItalic.otf
diff --git a/packages/tokens/assets/fonts/Inter-SemiBoldItalic.woff2 b/packages/tokens/assets/fonts/Inter-SemiBoldItalic.woff2
diff --git a/packages/tokens/package.json b/packages/tokens/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@hopper-ui/tokens",
     "author": "Workleap",
-    "version": "1.1.0",
+    "version": "2.0.0",
     "description": "The tokens package.",
     "license": "Apache-2.0",
     "repository": {

diff --git a/packages/tokens/src/style-dictionary/config.ts b/packages/tokens/src/style-dictionary/config.ts
@@ -21,9 +21,6 @@ export const fontsConfig = {
                             "type": "font"
                         }
                     },
-                    "options": {
-                        "fontPathPrefix": "./"
-                    }
                 }
             ],
             "actions": ["copy_assets"]

diff --git a/packages/tokens/src/style-dictionary/format/font-face.ts b/packages/tokens/src/style-dictionary/format/font-face.ts
@@ -1,7 +1,7 @@
 import type { Dictionary, Options, TransformedToken } from "style-dictionary";
 
 export function fontFace ({ dictionary, options }: { dictionary: Dictionary; options: Options }) {
-    const fontPathPrefix = options.fontPathPrefix || "../";
+    const fontPathPrefix = options.fontPathPrefix || "";
     const tokens = dictionary.allTokens;
 
     // https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src

diff --git a/packages/tokens/src/tokens/asset/fonts.tokens.json b/packages/tokens/src/tokens/asset/fonts.tokens.json
@@ -5,43 +5,43 @@
                 "normal": {
                     "410": {
                         "value": "assets/fonts/Inter-Regular",
-                        "formats": ["otf"]
+                        "formats": ["woff2"]
                     },
                     "505": {
                         "value": "assets/fonts/Inter-Medium",
-                        "formats": ["otf"]
+                        "formats": ["woff2"]
                     },
                     "590": {
                         "value": "assets/fonts/Inter-SemiBold",
-                        "formats": ["otf"]
+                        "formats": ["woff2"]
                     },
                     "690": {
                         "value": "assets/fonts/Inter-Bold",
-                        "formats": ["otf"]
+                        "formats": ["woff2"]
                     }
                 }
             },
             "ABC Favorit Mono": {
                 "normal": {
                     "400": {
                         "value": "assets/fonts/ABCFavoritMono-Regular",
-                        "formats": ["otf", "woff", "woff2"]
+                        "formats": ["woff2"]
                     }
                 }
             },
             "ABC Favorit": {
                 "normal": {
                     "410": {
                         "value": "assets/fonts/ABCFavorit-Regular",
-                        "formats": ["otf", "woff", "woff2"]
+                        "formats": ["woff2"]
                     },
                     "580": {
                         "value": "assets/fonts/ABCFavorit-Medium",
-                        "formats": ["otf", "woff", "woff2"]
+                        "formats": ["woff2"]
                     },
                     "680": {
                         "value": "assets/fonts/ABCFavorit-Bold",
-                        "formats": ["otf", "woff", "woff2"]
+                        "formats": ["woff2"]
                     }
                 }
             }