Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 48 additions & 16 deletions apps/composer/app/fonts.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,70 @@
/**
* The Aesthetic Function type set (matches af-site/assets/af.css): Oswald
* for headlines, IBM Plex Sans for body, IBM Plex Mono for labels and
* buttons, Jost for the wordmark. next/font downloads at build time and
* self-hosts under _next/static/media — no runtime request to Google, so
* the production smoke suite's clean-network check is unaffected.
* buttons, Jost for the wordmark.
*
* These were `next/font/google` declarations. Next self-hosted the result, so
* nothing was fetched at runtime — but the BUILD downloaded every face from
* fonts.gstatic.com, so a CDN hiccup failed the build outright and blocked
* merges and deploys. The faces now come from committed .woff2 files in
* packages/fonts, which no build has to go to the network for.
*
* The files there are the exact bytes Google was already serving this repo, and
* the descriptors below reproduce the @font-face rules those declarations
* generated — same weights, same styles, same font-display, same CSS variable
* names. See packages/fonts/README.md for provenance, subset and licensing.
*
* `adjustFontFallback: false` + an explicit `fallback` is not a change of
* fallback, it is what keeps the fallback the same: next/font/local would
* recompute the metric-matched face from our subset files and land on slightly
* different numbers. packages/fonts/fallbacks.css pins the faces at the values
* next/font/google emitted, and is imported here so the declarations and the
* faces they name travel together.
*/
import { IBM_Plex_Mono, IBM_Plex_Sans, Jost, Oswald } from "next/font/google";
import localFont from "next/font/local";

export const oswald = Oswald({
subsets: ["latin"],
weight: ["600"],
import "../../../packages/fonts/fallbacks.css";

export const oswald = localFont({
src: [{ path: "../../../packages/fonts/files/oswald-600-latin.woff2", weight: "600", style: "normal" }],
Comment on lines +24 to +29
variable: "--font-oswald",
display: "swap",
adjustFontFallback: false,
fallback: ["Oswald Fallback"],
});

export const plexSans = IBM_Plex_Sans({
subsets: ["latin"],
weight: ["400", "500", "600"],
// One variable file (wght 100..700) serves all three weights, exactly as the
// single file Google served for all three did.
export const plexSans = localFont({
src: [
{ path: "../../../packages/fonts/files/ibm-plex-sans-variable-latin.woff2", weight: "400", style: "normal" },
{ path: "../../../packages/fonts/files/ibm-plex-sans-variable-latin.woff2", weight: "500", style: "normal" },
{ path: "../../../packages/fonts/files/ibm-plex-sans-variable-latin.woff2", weight: "600", style: "normal" },
],
variable: "--font-plex-sans",
display: "swap",
adjustFontFallback: false,
fallback: ["IBM Plex Sans Fallback"],
});

export const plexMono = IBM_Plex_Mono({
subsets: ["latin"],
weight: ["400", "500", "600"],
export const plexMono = localFont({
src: [
{ path: "../../../packages/fonts/files/ibm-plex-mono-400-latin.woff2", weight: "400", style: "normal" },
{ path: "../../../packages/fonts/files/ibm-plex-mono-500-latin.woff2", weight: "500", style: "normal" },
{ path: "../../../packages/fonts/files/ibm-plex-mono-600-latin.woff2", weight: "600", style: "normal" },
],
variable: "--font-plex-mono",
display: "swap",
adjustFontFallback: false,
fallback: ["IBM Plex Mono Fallback"],
});

export const jost = Jost({
subsets: ["latin"],
weight: ["400"],
export const jost = localFont({
src: [{ path: "../../../packages/fonts/files/jost-400-latin.woff2", weight: "400", style: "normal" }],
variable: "--font-jost",
display: "swap",
adjustFontFallback: false,
fallback: ["Jost Fallback"],
});

export const fontVariables = [
Expand Down
64 changes: 48 additions & 16 deletions apps/web/app/fonts.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,70 @@
/**
* The Aesthetic Function type set (matches af-site/assets/af.css): Oswald
* for headlines, IBM Plex Sans for body, IBM Plex Mono for labels and
* buttons, Jost for the wordmark. next/font downloads at build time and
* self-hosts under _next/static/media — no runtime request to Google, so
* the production smoke suite's clean-network check is unaffected.
* buttons, Jost for the wordmark.
*
* These were `next/font/google` declarations. Next self-hosted the result, so
* nothing was fetched at runtime — but the BUILD downloaded every face from
* fonts.gstatic.com, so a CDN hiccup failed the build outright and blocked
* merges and deploys. The faces now come from committed .woff2 files in
* packages/fonts, which no build has to go to the network for.
*
* The files there are the exact bytes Google was already serving this repo, and
* the descriptors below reproduce the @font-face rules those declarations
* generated — same weights, same styles, same font-display, same CSS variable
* names. See packages/fonts/README.md for provenance, subset and licensing.
*
* `adjustFontFallback: false` + an explicit `fallback` is not a change of
* fallback, it is what keeps the fallback the same: next/font/local would
* recompute the metric-matched face from our subset files and land on slightly
* different numbers. packages/fonts/fallbacks.css pins the faces at the values
* next/font/google emitted, and is imported here so the declarations and the
* faces they name travel together.
*/
import { IBM_Plex_Mono, IBM_Plex_Sans, Jost, Oswald } from "next/font/google";
import localFont from "next/font/local";

export const oswald = Oswald({
subsets: ["latin"],
weight: ["600"],
import "../../../packages/fonts/fallbacks.css";

export const oswald = localFont({
src: [{ path: "../../../packages/fonts/files/oswald-600-latin.woff2", weight: "600", style: "normal" }],
Comment on lines +24 to +29
variable: "--font-oswald",
display: "swap",
adjustFontFallback: false,
fallback: ["Oswald Fallback"],
});

export const plexSans = IBM_Plex_Sans({
subsets: ["latin"],
weight: ["400", "500", "600"],
// One variable file (wght 100..700) serves all three weights, exactly as the
// single file Google served for all three did.
export const plexSans = localFont({
src: [
{ path: "../../../packages/fonts/files/ibm-plex-sans-variable-latin.woff2", weight: "400", style: "normal" },
{ path: "../../../packages/fonts/files/ibm-plex-sans-variable-latin.woff2", weight: "500", style: "normal" },
{ path: "../../../packages/fonts/files/ibm-plex-sans-variable-latin.woff2", weight: "600", style: "normal" },
],
variable: "--font-plex-sans",
display: "swap",
adjustFontFallback: false,
fallback: ["IBM Plex Sans Fallback"],
});

export const plexMono = IBM_Plex_Mono({
subsets: ["latin"],
weight: ["400", "500", "600"],
export const plexMono = localFont({
src: [
{ path: "../../../packages/fonts/files/ibm-plex-mono-400-latin.woff2", weight: "400", style: "normal" },
{ path: "../../../packages/fonts/files/ibm-plex-mono-500-latin.woff2", weight: "500", style: "normal" },
{ path: "../../../packages/fonts/files/ibm-plex-mono-600-latin.woff2", weight: "600", style: "normal" },
],
variable: "--font-plex-mono",
display: "swap",
adjustFontFallback: false,
fallback: ["IBM Plex Mono Fallback"],
});

export const jost = Jost({
subsets: ["latin"],
weight: ["400"],
export const jost = localFont({
src: [{ path: "../../../packages/fonts/files/jost-400-latin.woff2", weight: "400", style: "normal" }],
variable: "--font-jost",
display: "swap",
adjustFontFallback: false,
fallback: ["Jost Fallback"],
});

export const fontVariables = [
Expand Down
113 changes: 113 additions & 0 deletions packages/fonts/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
The four families vendored in ./files are each licensed under the SIL Open
Font License, Version 1.1. Every one of them declares that license in its own
`licenseURL` name record (http[s]://scripts.sil.org/OFL) — see ./README.md for
how to re-read that from the binaries. Their copyright notices, taken verbatim
from the `copyright` name record of the vendored files:

Oswald
Copyright 2016 The Oswald Project Authors
(https://github.com/googlefonts/OswaldFont)

IBM Plex Sans
Copyright 2019 IBM Corp. All rights reserved.
with Reserved Font Name "Plex"

IBM Plex Mono
Copyright 2017 IBM Corp. All rights reserved.
with Reserved Font Name "Plex"

Jost
Copyright 2020 The Jost Project Authors
(https://github.com/indestructible-type/Jost)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Loading
Loading