Revert "feat(@ibm/plex): Update plex dependency to use new packages (#…

…17025)" This reverts commit efd08bc.
carbon-design-system · Aug 19, 2024 · 8a8d669 · 8a8d669
1 parent 4924b96
commit 8a8d669
Show file tree

Hide file tree

Showing 23 changed files with 261 additions and 553 deletions.
diff --git a/.yarn/cache/@ibm-plex-mono-npm-0.0.3-alpha.0-2becc6711b-fbdfb70762.zip b/.yarn/cache/@ibm-plex-mono-npm-0.0.3-alpha.0-2becc6711b-fbdfb70762.zip
diff --git a/.yarn/cache/@ibm-plex-npm-6.0.0-next.6-9aee23c93c-1a81475964.zip b/.yarn/cache/@ibm-plex-npm-6.0.0-next.6-9aee23c93c-1a81475964.zip
diff --git a/.yarn/cache/@ibm-plex-sans-arabic-npm-0.0.3-alpha.0-5a162c0760-c390dd9788.zip b/.yarn/cache/@ibm-plex-sans-arabic-npm-0.0.3-alpha.0-5a162c0760-c390dd9788.zip
diff --git a/.yarn/cache/@ibm-plex-sans-devanagari-npm-0.0.3-alpha.0-7f13ef378d-ef3cd96710.zip b/.yarn/cache/@ibm-plex-sans-devanagari-npm-0.0.3-alpha.0-7f13ef378d-ef3cd96710.zip
diff --git a/.yarn/cache/@ibm-plex-sans-hebrew-npm-0.0.3-alpha.0-e21223915a-e67ed6e081.zip b/.yarn/cache/@ibm-plex-sans-hebrew-npm-0.0.3-alpha.0-e21223915a-e67ed6e081.zip
diff --git a/.yarn/cache/@ibm-plex-sans-npm-0.0.3-alpha.0-eadb18db06-5b0b0521db.zip b/.yarn/cache/@ibm-plex-sans-npm-0.0.3-alpha.0-eadb18db06-5b0b0521db.zip
diff --git a/.yarn/cache/@ibm-plex-sans-thai-looped-npm-0.0.3-alpha.0-11cf24af96-11272b1353.zip b/.yarn/cache/@ibm-plex-sans-thai-looped-npm-0.0.3-alpha.0-11cf24af96-11272b1353.zip
diff --git a/.yarn/cache/@ibm-plex-sans-thai-npm-0.0.3-alpha.0-9228f6228a-baac49d77d.zip b/.yarn/cache/@ibm-plex-sans-thai-npm-0.0.3-alpha.0-9228f6228a-baac49d77d.zip
diff --git a/.yarn/cache/@ibm-plex-serif-npm-0.0.3-alpha.0-ef5dcb26c6-462dcf3393.zip b/.yarn/cache/@ibm-plex-serif-npm-0.0.3-alpha.0-ef5dcb26c6-462dcf3393.zip
diff --git a/README.md b/README.md
@@ -297,8 +297,11 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
     <td align="center"><a href="https://github.com/nandininarayanofficial"><img src="https://avatars.githubusercontent.com/u/165769075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nandininarayanofficial</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=nandininarayanofficial" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/digiacomo-a"><img src="https://avatars.githubusercontent.com/u/117646602?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrea DG</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=digiacomo-a" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/lluisrojass"><img src="https://avatars.githubusercontent.com/u/15043356?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luis</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lluisrojass" title="Code">💻</a></td>
+
     <td align="center"><a href="https://github.com/lharrison13"><img src="https://avatars.githubusercontent.com/u/172074450?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luke Harrison</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lharrison13" title="Code">💻</a></td>
+
     <td align="center"><a href="https://github.com/tekno0ryder"><img src="https://avatars.githubusercontent.com/u/8721803?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ahmed Alsinan</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=tekno0ryder" title="Code">💻</a></td>
+
   </tr>
 </table>
 

diff --git a/packages/styles/package.json b/packages/styles/package.json
@@ -47,14 +47,7 @@
     "@carbon/motion": "^11.20.0",
     "@carbon/themes": "^11.38.0",
     "@carbon/type": "^11.29.0",
-    "@ibm/plex-mono": "0.0.3-alpha.0",
-    "@ibm/plex-sans": "0.0.3-alpha.0",
-    "@ibm/plex-sans-arabic": "0.0.3-alpha.0",
-    "@ibm/plex-sans-devanagari": "0.0.3-alpha.0",
-    "@ibm/plex-sans-hebrew": "0.0.3-alpha.0",
-    "@ibm/plex-sans-thai": "0.0.3-alpha.0",
-    "@ibm/plex-sans-thai-looped": "0.0.3-alpha.0",
-    "@ibm/plex-serif": "0.0.3-alpha.0",
+    "@ibm/plex": "6.0.0-next.6",
     "@ibm/telemetry-js": "^1.5.0"
   },
   "devDependencies": {

diff --git a/packages/styles/scss/_reset.scss b/packages/styles/scss/_reset.scss
@@ -99,7 +99,6 @@
     border: 0;
     margin: 0;
     font: inherit;
-    font-feature-settings: 'liga' 1;
     font-size: 100%;
     vertical-align: baseline;
   }

diff --git a/packages/styles/scss/fonts/__tests__/__snapshots__/fonts-test.js.snap b/packages/styles/scss/fonts/__tests__/__snapshots__/fonts-test.js.snap
diff --git a/packages/styles/scss/fonts/_mono.scss b/packages/styles/scss/fonts/_mono.scss
@@ -13,8 +13,7 @@ $font-family: 'IBM Plex Mono';
 $name: 'IBM-Plex-Mono';
 $styles: (normal, italic);
 $unicode-ranges: (Cyrillic, Pi, Latin3, Latin2, Latin1);
-$formats: (woff2);
-$package-name: 'mono';
+$formats: (woff2, woff);
 
 @mixin thin($styles: $styles, $unicode-ranges: $unicode-ranges) {
   @each $style in $styles {
@@ -24,14 +23,7 @@ $package-name: 'mono';
         font-family: $font-family;
         font-style: $style;
         font-weight: 100;
-        src: src.get(
-          $name,
-          Thin,
-          $style,
-          $unicode-range,
-          $formats,
-          $package-name
-        );
+        src: src.get($name, Thin, $style, $unicode-range, $formats);
         unicode-range: unicode.get-range($unicode-range);
       }
     }
@@ -46,14 +38,7 @@ $package-name: 'mono';
         font-family: $font-family;
         font-style: $style;
         font-weight: 200;
-        src: src.get(
-          $name,
-          ExtraLight,
-          $style,
-          $unicode-range,
-          $formats,
-          $package-name
-        );
+        src: src.get($name, ExtraLight, $style, $unicode-range, $formats);
         unicode-range: unicode.get-range($unicode-range);
       }
     }
@@ -68,14 +53,7 @@ $package-name: 'mono';
         font-family: $font-family;
         font-style: $style;
         font-weight: 300;
-        src: src.get(
-          $name,
-          Light,
-          $style,
-          $unicode-range,
-          $formats,
-          $package-name
-        );
+        src: src.get($name, Light, $style, $unicode-range, $formats);
         unicode-range: unicode.get-range($unicode-range);
       }
     }
@@ -90,14 +68,7 @@ $package-name: 'mono';
         font-family: $font-family;
         font-style: $style;
         font-weight: 400;
-        src: src.get(
-          $name,
-          Regular,
-          $style,
-          $unicode-range,
-          $formats,
-          $package-name
-        );
+        src: src.get($name, Regular, $style, $unicode-range, $formats);
         unicode-range: unicode.get-range($unicode-range);
       }
     }
@@ -112,14 +83,7 @@ $package-name: 'mono';
         font-family: $font-family;
         font-style: $style;
         font-weight: 450;
-        src: src.get(
-          $name,
-          Text,
-          $style,
-          $unicode-range,
-          $formats,
-          $package-name
-        );
+        src: src.get($name, Text, $style, $unicode-range, $formats);
         unicode-range: unicode.get-range($unicode-range);
       }
     }
@@ -134,14 +98,7 @@ $package-name: 'mono';
         font-family: $font-family;
         font-style: $style;
         font-weight: 500;
-        src: src.get(
-          $name,
-          Medium,
-          $style,
-          $unicode-range,
-          $formats,
-          $package-name
-        );
+        src: src.get($name, Medium, $style, $unicode-range, $formats);
         unicode-range: unicode.get-range($unicode-range);
       }
     }
@@ -156,14 +113,7 @@ $package-name: 'mono';
         font-family: $font-family;
         font-style: $style;
         font-weight: 600;
-        src: src.get(
-          $name,
-          SemiBold,
-          $style,
-          $unicode-range,
-          $formats,
-          $package-name
-        );
+        src: src.get($name, SemiBold, $style, $unicode-range, $formats);
         unicode-range: unicode.get-range($unicode-range);
       }
     }
@@ -178,14 +128,7 @@ $package-name: 'mono';
         font-family: $font-family;
         font-style: $style;
         font-weight: 700;
-        src: src.get(
-          $name,
-          Bold,
-          $style,
-          $unicode-range,
-          $formats,
-          $package-name
-        );
+        src: src.get($name, Bold, $style, $unicode-range, $formats);
         unicode-range: unicode.get-range($unicode-range);
       }
     }

diff --git a/packages/styles/scss/fonts/_sans-arabic.scss b/packages/styles/scss/fonts/_sans-arabic.scss
@@ -12,7 +12,6 @@ $font-family: 'IBM Plex Sans Arabic';
 $name: 'IBM-Plex-Sans-Arabic';
 $styles: (normal);
 $formats: (woff2, woff);
-$package-name: 'sans-arabic';
 
 @mixin thin() {
   @font-face {
@@ -24,8 +23,7 @@ $package-name: 'sans-arabic';
       $name: $name,
       $weight: Thin,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -40,8 +38,7 @@ $package-name: 'sans-arabic';
       $name: $name,
       $weight: ExtraLight,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -56,8 +53,7 @@ $package-name: 'sans-arabic';
       $name: $name,
       $weight: Light,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -72,8 +68,7 @@ $package-name: 'sans-arabic';
       $name: $name,
       $weight: Regular,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -88,8 +83,7 @@ $package-name: 'sans-arabic';
       $name: $name,
       $weight: Text,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -104,8 +98,7 @@ $package-name: 'sans-arabic';
       $name: $name,
       $weight: Medium,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -120,8 +113,7 @@ $package-name: 'sans-arabic';
       $name: $name,
       $weight: SemiBold,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -136,8 +128,7 @@ $package-name: 'sans-arabic';
       $name: $name,
       $weight: Bold,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }

diff --git a/packages/styles/scss/fonts/_sans-devanagari.scss b/packages/styles/scss/fonts/_sans-devanagari.scss
@@ -12,7 +12,6 @@ $font-family: 'IBM Plex Sans Devanagari';
 $name: 'IBM-Plex-Sans-Devanagari';
 $styles: (normal);
 $formats: (woff2, woff);
-$package-name: 'sans-devanagari';
 
 @mixin thin() {
   @font-face {
@@ -24,8 +23,7 @@ $package-name: 'sans-devanagari';
       $name: $name,
       $weight: Thin,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -40,8 +38,7 @@ $package-name: 'sans-devanagari';
       $name: $name,
       $weight: ExtraLight,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -56,8 +53,7 @@ $package-name: 'sans-devanagari';
       $name: $name,
       $weight: Light,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -72,8 +68,7 @@ $package-name: 'sans-devanagari';
       $name: $name,
       $weight: Regular,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -88,8 +83,7 @@ $package-name: 'sans-devanagari';
       $name: $name,
       $weight: Text,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -104,8 +98,7 @@ $package-name: 'sans-devanagari';
       $name: $name,
       $weight: Medium,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -120,8 +113,7 @@ $package-name: 'sans-devanagari';
       $name: $name,
       $weight: SemiBold,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }
@@ -136,8 +128,7 @@ $package-name: 'sans-devanagari';
       $name: $name,
       $weight: Bold,
       $style: $styles,
-      $formats: $formats,
-      $package-name: $package-name
+      $formats: $formats
     );
   }
 }