Skip to content

armgit / mimik

Public Imported from GitHub
0

🎬 A browser extension and desktop app that turns your clicks into step-by-step guides with annotated screenshots πŸ“–

fix(core): embed Poppins in the HTML export instead of linking Google Fonts

Luis Ortiz76503cb62a46
diff --git a/apps/desktop/src/renderer/index.html b/apps/desktop/src/renderer/index.html
index 5a08ec5..fe61aee 100644
--- a/apps/desktop/src/renderer/index.html
+++ b/apps/desktop/src/renderer/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
- <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src 'self' data: blob: mimik-screenshot:; media-src 'self' blob:; connect-src 'self' blob: mimik-screenshot:; style-src 'self' 'unsafe-inline'" />
+ <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src 'self' data: blob: mimik-screenshot:; media-src 'self' blob:; connect-src 'self' blob: mimik-screenshot:; style-src 'self' 'unsafe-inline'; font-src 'self' data:" />
<title>Mimik</title>
</head>
<body>
diff --git a/packages/core/src/export/__tests__/html-export.test.ts b/packages/core/src/export/__tests__/html-export.test.ts
index 28d1309..0c0e610 100644
--- a/packages/core/src/export/__tests__/html-export.test.ts
+++ b/packages/core/src/export/__tests__/html-export.test.ts
@@ -97,6 +97,19 @@ describe('exportGuideAsHTML screenshot embedding', () => {
});
});
+describe('exportGuideAsHTML font', () => {
+ it('carries its own Poppins and asks no one else for a font', async () => {
+ const html = await render([makeStep(0)], new Map());
+ expect(html).not.toContain('fonts.googleapis.com');
+ expect(html).not.toContain('fonts.gstatic.com');
+ for (const weight of [400, 600, 700]) {
+ expect(html).toMatch(
+ new RegExp(`font-weight: ${weight}; font-display: swap; src: url\\(data:font/woff2;base64,`),
+ );
+ }
+ });
+});
+
describe('exportGuideAsHTML mixed browser and desktop steps', () => {
beforeEach(() => {
rendered.mockReset();
diff --git a/packages/core/src/export/html-export.ts b/packages/core/src/export/html-export.ts
index 31eb857..dc818b6 100644
--- a/packages/core/src/export/html-export.ts
+++ b/packages/core/src/export/html-export.ts
@@ -1,6 +1,7 @@
import { i18n } from '@/core/env';
import { fitLogo, loadBranding } from '@/core/export/branding';
import { type ExportOptions, IMAGE_SCALE_FACTORS, loadExportOptions } from '@/core/export/options';
+import { POPPINS_FONT_FACES } from '@/core/export/poppins';
import {
blobToBase64,
escapeHtml,
@@ -180,10 +181,8 @@ export async function exportGuideAsHTML(
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>${escapeHtml(guide.title)}</title>
${guide.description ? `<meta name="description" content="${escapeHtml(guide.description)}">` : ''}
- <link rel="preconnect" href="https://fonts.googleapis.com">
- <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
- <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;600;700&display=swap" rel="stylesheet">
<style>
+ ${POPPINS_FONT_FACES}
* { margin: 0; padding: 0; box-sizing: border-box; }
body { font-family: 'Poppins', sans-serif; max-width: 860px; margin: 0 auto; padding: 56px 28px; color: #1E1B4B; background: #fff; }
a { text-decoration: none; }
diff --git a/packages/core/src/export/poppins.ts b/packages/core/src/export/poppins.ts
new file mode 100644
index 0000000..5621c86
--- /dev/null
+++ b/packages/core/src/export/poppins.ts
@@ -0,0 +1,27 @@
+import latin400 from '@fontsource/poppins/files/poppins-latin-400-normal.woff2?inline';
+import latin600 from '@fontsource/poppins/files/poppins-latin-600-normal.woff2?inline';
+import latin700 from '@fontsource/poppins/files/poppins-latin-700-normal.woff2?inline';
+import latinExt400 from '@fontsource/poppins/files/poppins-latin-ext-400-normal.woff2?inline';
+import latinExt600 from '@fontsource/poppins/files/poppins-latin-ext-600-normal.woff2?inline';
+import latinExt700 from '@fontsource/poppins/files/poppins-latin-ext-700-normal.woff2?inline';
+
+const LATIN =
+ 'U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD';
+const LATIN_EXT =
+ 'U+0100-02BA,U+02BD-02C5,U+02C7-02CC,U+02CE-02D7,U+02DD-02FF,U+0304,U+0308,U+0329,U+1D00-1DBF,U+1E00-1E9F,U+1EF2-1EFF,U+2020,U+20A0-20AB,U+20AD-20C0,U+2113,U+2C60-2C7F,U+A720-A7FF';
+
+const FILES: [number, string, string][] = [
+ [400, latin400, latinExt400],
+ [600, latin600, latinExt600],
+ [700, latin700, latinExt700],
+];
+
+export const POPPINS_FONT_FACES = FILES.flatMap(([weight, latin, latinExt]) =>
+ [
+ [latinExt, LATIN_EXT],
+ [latin, LATIN],
+ ].map(
+ ([src, range]) =>
+ `@font-face { font-family: 'Poppins'; font-style: normal; font-weight: ${weight}; font-display: swap; src: url(${src}) format('woff2'); unicode-range: ${range}; }`,
+ ),
+).join('\n ');
diff --git a/packages/core/src/export/woff2.d.ts b/packages/core/src/export/woff2.d.ts
new file mode 100644
index 0000000..2b037ab
--- /dev/null
+++ b/packages/core/src/export/woff2.d.ts
@@ -0,0 +1,4 @@
+declare module '*.woff2?inline' {
+ const dataUrl: string;
+ export default dataUrl;
+}