Merge branch 'main' into kl-gm-910

LinKCoding · LinKCoding · commit 3d3e8bd08960 · 2025-01-10T16:04:44.000-05:00
diff --git a/packages/gamut-icons/CHANGELOG.md b/packages/gamut-icons/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [9.37.1](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-icons@9.37.0...@codecademy/gamut-icons@9.37.1) (2025-01-09)
+
+**Note:** Version bump only for package @codecademy/gamut-icons
+
 ## [9.37.0](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-icons@9.36.0...@codecademy/gamut-icons@9.37.0) (2025-01-06)
 
 ### Features
diff --git a/packages/gamut-icons/package.json b/packages/gamut-icons/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@codecademy/gamut-icons",
   "description": "Icon library for codecademy.com",
-  "version": "9.37.0",
+  "version": "9.37.1",
   "author": "Codecademy <dev@codecademy.com>",
   "dependencies": {
-    "@codecademy/gamut-styles": "17.2.0",
+    "@codecademy/gamut-styles": "17.3.0",
     "@codecademy/variance": "0.22.0"
   },
   "files": [
diff --git a/packages/gamut-illustrations/CHANGELOG.md b/packages/gamut-illustrations/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.50.1](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-illustrations@0.50.0...@codecademy/gamut-illustrations@0.50.1) (2025-01-09)
+
+**Note:** Version bump only for package @codecademy/gamut-illustrations
+
 ## [0.50.0](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-illustrations@0.49.2...@codecademy/gamut-illustrations@0.50.0) (2024-12-13)
 
 ### Features
diff --git a/packages/gamut-illustrations/package.json b/packages/gamut-illustrations/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@codecademy/gamut-illustrations",
   "description": "Illustrations library for Codecademy",
-  "version": "0.50.0",
+  "version": "0.50.1",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "bugs": "https://github.com/Codecademy/gamut/issues",
   "dependencies": {
-    "@codecademy/gamut-styles": "17.2.0",
+    "@codecademy/gamut-styles": "17.3.0",
     "classnames": "^2.2.5"
   },
   "files": [
diff --git a/packages/gamut-kit/CHANGELOG.md b/packages/gamut-kit/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.6.460](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-kit@0.6.459...@codecademy/gamut-kit@0.6.460) (2025-01-09)
+
+**Note:** Version bump only for package @codecademy/gamut-kit
+
 ### [0.6.459](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-kit@0.6.458...@codecademy/gamut-kit@0.6.459) (2025-01-06)
 
 **Note:** Version bump only for package @codecademy/gamut-kit
diff --git a/packages/gamut-kit/package.json b/packages/gamut-kit/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@codecademy/gamut-kit",
   "description": "Styleguide & Component library for Codecademy",
-  "version": "0.6.459",
+  "version": "0.6.460",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "dependencies": {
-    "@codecademy/gamut": "57.6.3",
-    "@codecademy/gamut-icons": "9.37.0",
-    "@codecademy/gamut-illustrations": "0.50.0",
-    "@codecademy/gamut-patterns": "0.10.0",
-    "@codecademy/gamut-styles": "17.2.0",
-    "@codecademy/gamut-tests": "5.2.0",
+    "@codecademy/gamut": "57.6.4",
+    "@codecademy/gamut-icons": "9.37.1",
+    "@codecademy/gamut-illustrations": "0.50.1",
+    "@codecademy/gamut-patterns": "0.10.1",
+    "@codecademy/gamut-styles": "17.3.0",
+    "@codecademy/gamut-tests": "5.2.1",
     "@codecademy/variance": "0.22.0",
     "component-test-setup": "^0.3.1"
   },
diff --git a/packages/gamut-patterns/CHANGELOG.md b/packages/gamut-patterns/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.10.1](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-patterns@0.10.0...@codecademy/gamut-patterns@0.10.1) (2025-01-09)
+
+**Note:** Version bump only for package @codecademy/gamut-patterns
+
 ## [0.10.0](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-patterns@0.9.17...@codecademy/gamut-patterns@0.10.0) (2024-12-13)
 
 ### Features
diff --git a/packages/gamut-patterns/package.json b/packages/gamut-patterns/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@codecademy/gamut-patterns",
   "description": "Pattern library for Codecademy",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "bugs": "https://github.com/Codecademy/gamut/issues",
   "dependencies": {
-    "@codecademy/gamut-styles": "17.2.0",
+    "@codecademy/gamut-styles": "17.3.0",
     "@codecademy/variance": "0.22.0",
     "classnames": "^2.2.5"
   },
diff --git a/packages/gamut-styles/CHANGELOG.md b/packages/gamut-styles/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [17.3.0](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-styles@17.2.0...@codecademy/gamut-styles@17.3.0) (2025-01-09)
+
+### Features
+
+- **fonts:** Prioritize woff2 ([#3003](https://github.com/Codecademy/gamut/issues/3003)) ([4c319c6](https://github.com/Codecademy/gamut/commit/4c319c655dbd473f3db214a812b26860d82986f2))
+
 ## [17.2.0](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-styles@17.1.2...@codecademy/gamut-styles@17.2.0) (2024-12-13)
 
 ### Features
diff --git a/packages/gamut-styles/package.json b/packages/gamut-styles/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@codecademy/gamut-styles",
   "description": "Styleguide & Component library for codecademy.com",
-  "version": "17.2.0",
+  "version": "17.3.0",
   "author": "Jake Hiller <jake@codecademy.com>",
   "dependencies": {
     "@codecademy/variance": "0.22.0",
diff --git a/packages/gamut-styles/src/AssetProvider.tsx b/packages/gamut-styles/src/AssetProvider.tsx
@@ -1,18 +1,21 @@
 import { webFonts } from './remoteAssets/fonts';
 
+/*
+ * Only preload woff2 fonts, since woff1 are only included as fallbacks.
+ */
 export const createFontLinks = () =>
-  webFonts.flatMap(({ filePath, extensions }) =>
-    extensions.map((ext) => (
+  webFonts
+    .filter((f) => f.extensions.includes('woff2'))
+    .map(({ filePath }) => (
       <link
-        key={`${filePath}-${ext}`}
+        key={filePath}
         rel="preload"
-        href={`${filePath}.${ext}`}
+        href={`${filePath}.woff2`}
         crossOrigin="anonymous"
         as="font"
-        type={`font/${ext}`}
+        type="font/woff2"
       />
-    ))
-  );
+    ));
 
 export const AssetProvider = () => {
   return <>{createFontLinks()}</>;
diff --git a/packages/gamut-styles/src/remoteAssets/fonts.ts b/packages/gamut-styles/src/remoteAssets/fonts.ts
@@ -1,39 +1,41 @@
 export const FONT_ASSET_PATH = `https://www.codecademy.com/gamut`;
 
+// woff2 should precede woff so that browsers try woff2 first.
+
 export const webFonts = [
   {
     filePath: `${FONT_ASSET_PATH}/apercu-regular-pro`,
-    extensions: ['woff', 'woff2'],
+    extensions: ['woff2', 'woff'],
     name: 'Apercu',
   },
   {
     filePath: `${FONT_ASSET_PATH}/apercu-italic-pro`,
-    extensions: ['woff', 'woff2'],
+    extensions: ['woff2', 'woff'],
     name: 'Apercu',
     style: 'italic',
   },
   {
     filePath: `${FONT_ASSET_PATH}/apercu-bold-pro`,
-    extensions: ['woff', 'woff2'],
+    extensions: ['woff2', 'woff'],
     name: 'Apercu',
     weight: 'bold',
   },
   {
     filePath: `${FONT_ASSET_PATH}/apercu-bold-italic-pro`,
-    extensions: ['woff', 'woff2'],
+    extensions: ['woff2', 'woff'],
     name: 'Apercu',
     weight: 'bold',
     style: 'italic',
   },
   {
     filePath: `${FONT_ASSET_PATH}/SuisseIntlMono-Bold-WebS`,
-    extensions: ['woff', 'woff2'],
+    extensions: ['woff2', 'woff'],
     name: 'Suisse',
     weight: 'bold',
   },
   {
     filePath: `${FONT_ASSET_PATH}/SuisseIntlMono-Regular-WebS`,
-    extensions: ['woff', 'woff2'],
+    extensions: ['woff2', 'woff'],
     name: 'Suisse',
   },
 ];
diff --git a/packages/gamut-tests/CHANGELOG.md b/packages/gamut-tests/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [5.2.1](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-tests@5.2.0...@codecademy/gamut-tests@5.2.1) (2025-01-09)
+
+**Note:** Version bump only for package @codecademy/gamut-tests
+
 ## [5.2.0](https://github.com/Codecademy/gamut/compare/@codecademy/gamut-tests@5.1.4...@codecademy/gamut-tests@5.2.0) (2024-12-13)
 
 ### Features
diff --git a/packages/gamut-tests/package.json b/packages/gamut-tests/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@codecademy/gamut-tests",
   "description": "Shared component test setup for Gamut applications",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "dependencies": {
-    "@codecademy/gamut-styles": "17.2.0",
+    "@codecademy/gamut-styles": "17.3.0",
     "component-test-setup": "*",
     "lodash": "^4.17.5"
   },
diff --git a/packages/gamut/CHANGELOG.md b/packages/gamut/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [57.6.4](https://github.com/Codecademy/gamut/compare/@codecademy/gamut@57.6.3...@codecademy/gamut@57.6.4) (2025-01-09)
+
+**Note:** Version bump only for package @codecademy/gamut
+
 ### [57.6.3](https://github.com/Codecademy/gamut/compare/@codecademy/gamut@57.6.2...@codecademy/gamut@57.6.3) (2025-01-06)
 
 **Note:** Version bump only for package @codecademy/gamut
diff --git a/packages/gamut/package.json b/packages/gamut/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@codecademy/gamut",
   "description": "Styleguide & Component library for Codecademy",
-  "version": "57.6.3",
+  "version": "57.6.4",
   "author": "Codecademy Engineering <dev@codecademy.com>",
   "dependencies": {
-    "@codecademy/gamut-icons": "9.37.0",
-    "@codecademy/gamut-illustrations": "0.50.0",
-    "@codecademy/gamut-patterns": "0.10.0",
-    "@codecademy/gamut-styles": "17.2.0",
+    "@codecademy/gamut-icons": "9.37.1",
+    "@codecademy/gamut-illustrations": "0.50.1",
+    "@codecademy/gamut-patterns": "0.10.1",
+    "@codecademy/gamut-styles": "17.3.0",
     "@codecademy/variance": "0.22.0",
     "@reach/auto-id": "^0.16.0",
     "@reach/tabs": "^0.16.4",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@codecademy/gamut-styles",`
`3`	`3`	`"description": "Styleguide & Component library for codecademy.com",`
`4`		`- "version": "17.2.0",`
	`4`	`+ "version": "17.3.0",`
`5`	`5`	`"author": "Jake Hiller <jake@codecademy.com>",`
`6`	`6`	`"dependencies": {`
`7`	`7`	`"@codecademy/variance": "0.22.0",`