diff --git a/app/srv/core/main.css b/app/srv/core/main.css index 99135f34..f43fa0d4 100644 --- a/app/srv/core/main.css +++ b/app/srv/core/main.css @@ -1,2 +1,2 @@ -@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url(./files/source-sans-3-cyrillic-ext-400-normal.woff2) format("woff2"),url(./files/source-sans-3-cyrillic-ext-400-normal.woff) format("woff");unicode-range:U+0460-052F,U+1C80-1C88,U+20B4,U+2DE0-2DFF,U+A640-A69F,U+FE2E-FE2F}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url(./files/source-sans-3-cyrillic-400-normal.woff2) format("woff2"),url(./files/source-sans-3-cyrillic-400-normal.woff) format("woff");unicode-range:U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url(./files/source-sans-3-greek-ext-400-normal.woff2) format("woff2"),url(./files/source-sans-3-greek-ext-400-normal.woff) format("woff");unicode-range:U+1F00-1FFF}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url(./files/source-sans-3-greek-400-normal.woff2) format("woff2"),url(./files/source-sans-3-greek-400-normal.woff) format("woff");unicode-range:U+0370-0377,U+037A-037F,U+0384-038A,U+038C,U+038E-03A1,U+03A3-03FF}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url(./files/source-sans-3-vietnamese-400-normal.woff2) format("woff2"),url(./files/source-sans-3-vietnamese-400-normal.woff) format("woff");unicode-range:U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1EA0-1EF9,U+20AB}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url(./files/source-sans-3-latin-ext-400-normal.woff2) format("woff2"),url(./files/source-sans-3-latin-ext-400-normal.woff) format("woff");unicode-range:U+0100-02AF,U+0304,U+0308,U+0329,U+1E00-1E9F,U+1EF2-1EFF,U+2020,U+20A0-20AB,U+20AD-20C0,U+2113,U+2C60-2C7F,U+A720-A7FF}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url(./files/source-sans-3-latin-400-normal.woff2) format("woff2"),url(./files/source-sans-3-latin-400-normal.woff) format("woff");unicode-range: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+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD} +@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url("./source-sans-3-cyrillic-ext-400-normal.woff2") format("woff2"),url("./source-sans-3-cyrillic-ext-400-normal.woff") format("woff");unicode-range:U+0460-052F,U+1C80-1C88,U+20B4,U+2DE0-2DFF,U+A640-A69F,U+FE2E-FE2F}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url("./source-sans-3-cyrillic-400-normal.woff2") format("woff2"),url("./source-sans-3-cyrillic-400-normal.woff") format("woff");unicode-range:U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url("./source-sans-3-greek-ext-400-normal.woff2") format("woff2"),url("./source-sans-3-greek-ext-400-normal.woff") format("woff");unicode-range:U+1F00-1FFF}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url("./source-sans-3-greek-400-normal.woff2") format("woff2"),url("./source-sans-3-greek-400-normal.woff") format("woff");unicode-range:U+0370-0377,U+037A-037F,U+0384-038A,U+038C,U+038E-03A1,U+03A3-03FF}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url("./source-sans-3-vietnamese-400-normal.woff2") format("woff2"),url("./source-sans-3-vietnamese-400-normal.woff") format("woff");unicode-range:U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1EA0-1EF9,U+20AB}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url("./source-sans-3-latin-ext-400-normal.woff2") format("woff2"),url("./source-sans-3-latin-ext-400-normal.woff") format("woff");unicode-range:U+0100-02AF,U+0304,U+0308,U+0329,U+1E00-1E9F,U+1EF2-1EFF,U+2020,U+20A0-20AB,U+20AD-20C0,U+2113,U+2C60-2C7F,U+A720-A7FF}@font-face{font-family:"Source Sans 3";font-style:normal;font-display:swap;font-weight:400;src:url("./source-sans-3-latin-400-normal.woff2") format("woff2"),url("./source-sans-3-latin-400-normal.woff") format("woff");unicode-range: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+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD} /*# sourceMappingURL=main.css.map */ diff --git a/app/srv/core/source-sans-3-cyrillic-400-normal.woff b/app/srv/core/source-sans-3-cyrillic-400-normal.woff new file mode 100644 index 00000000..d6fd3c43 Binary files /dev/null and b/app/srv/core/source-sans-3-cyrillic-400-normal.woff differ diff --git a/app/srv/core/source-sans-3-cyrillic-400-normal.woff2 b/app/srv/core/source-sans-3-cyrillic-400-normal.woff2 new file mode 100644 index 00000000..5e243cb6 Binary files /dev/null and b/app/srv/core/source-sans-3-cyrillic-400-normal.woff2 differ diff --git a/app/srv/core/source-sans-3-cyrillic-ext-400-normal.woff b/app/srv/core/source-sans-3-cyrillic-ext-400-normal.woff new file mode 100644 index 00000000..8585032e Binary files /dev/null and b/app/srv/core/source-sans-3-cyrillic-ext-400-normal.woff differ diff --git a/app/srv/core/source-sans-3-cyrillic-ext-400-normal.woff2 b/app/srv/core/source-sans-3-cyrillic-ext-400-normal.woff2 new file mode 100644 index 00000000..0ca1f3c4 Binary files /dev/null and b/app/srv/core/source-sans-3-cyrillic-ext-400-normal.woff2 differ diff --git a/app/srv/core/source-sans-3-greek-400-normal.woff b/app/srv/core/source-sans-3-greek-400-normal.woff new file mode 100644 index 00000000..7ff8f31c Binary files /dev/null and b/app/srv/core/source-sans-3-greek-400-normal.woff differ diff --git a/app/srv/core/source-sans-3-greek-400-normal.woff2 b/app/srv/core/source-sans-3-greek-400-normal.woff2 new file mode 100644 index 00000000..65b0903b Binary files /dev/null and b/app/srv/core/source-sans-3-greek-400-normal.woff2 differ diff --git a/app/srv/core/source-sans-3-greek-ext-400-normal.woff b/app/srv/core/source-sans-3-greek-ext-400-normal.woff new file mode 100644 index 00000000..af6264dc Binary files /dev/null and b/app/srv/core/source-sans-3-greek-ext-400-normal.woff differ diff --git a/app/srv/core/source-sans-3-greek-ext-400-normal.woff2 b/app/srv/core/source-sans-3-greek-ext-400-normal.woff2 new file mode 100644 index 00000000..9487428d Binary files /dev/null and b/app/srv/core/source-sans-3-greek-ext-400-normal.woff2 differ diff --git a/app/srv/core/source-sans-3-latin-400-normal.woff b/app/srv/core/source-sans-3-latin-400-normal.woff new file mode 100644 index 00000000..0704b9e2 Binary files /dev/null and b/app/srv/core/source-sans-3-latin-400-normal.woff differ diff --git a/app/srv/core/source-sans-3-latin-400-normal.woff2 b/app/srv/core/source-sans-3-latin-400-normal.woff2 new file mode 100644 index 00000000..c77d9e38 Binary files /dev/null and b/app/srv/core/source-sans-3-latin-400-normal.woff2 differ diff --git a/app/srv/core/source-sans-3-latin-ext-400-normal.woff b/app/srv/core/source-sans-3-latin-ext-400-normal.woff new file mode 100644 index 00000000..dd42e709 Binary files /dev/null and b/app/srv/core/source-sans-3-latin-ext-400-normal.woff differ diff --git a/app/srv/core/source-sans-3-latin-ext-400-normal.woff2 b/app/srv/core/source-sans-3-latin-ext-400-normal.woff2 new file mode 100644 index 00000000..96daa9f3 Binary files /dev/null and b/app/srv/core/source-sans-3-latin-ext-400-normal.woff2 differ diff --git a/app/srv/core/source-sans-3-vietnamese-400-normal.woff b/app/srv/core/source-sans-3-vietnamese-400-normal.woff new file mode 100644 index 00000000..b6337feb Binary files /dev/null and b/app/srv/core/source-sans-3-vietnamese-400-normal.woff differ diff --git a/app/srv/core/source-sans-3-vietnamese-400-normal.woff2 b/app/srv/core/source-sans-3-vietnamese-400-normal.woff2 new file mode 100644 index 00000000..61efc3d8 Binary files /dev/null and b/app/srv/core/source-sans-3-vietnamese-400-normal.woff2 differ diff --git a/bun.lockb b/bun.lockb index db85ddd5..91f332bf 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/pkgs/core/build-core.ts b/pkgs/core/build-core.ts index ed575ea1..2f41738b 100644 --- a/pkgs/core/build-core.ts +++ b/pkgs/core/build-core.ts @@ -12,7 +12,8 @@ const ctx = await context({ minify: true, sourcemap: true, logLevel: "error", - external: ["*.png", "*.woff", "*.woff2", "*.ttf", "*.jpeg", "*.jpg", "*.svg"], + assetNames: `[name]`, + loader: { ".woff": "file", ".ttf": "file", ".woff2": "file" }, define: { "process.env.NODE_ENV": `"production"`, }, diff --git a/pkgs/core/build.ts b/pkgs/core/build.ts index f7942835..435b37b3 100644 --- a/pkgs/core/build.ts +++ b/pkgs/core/build.ts @@ -5,7 +5,6 @@ import { dir } from "dir"; import { build } from "esbuild"; import { fdir } from "fdir"; import { statSync } from "fs"; -import { platform } from "os"; import { copyAsync, existsAsync, @@ -13,6 +12,8 @@ import { removeAsync, writeAsync, } from "fs-jetpack"; +import { platform } from "os"; + const brotli = await brotliPromise; await build({ @@ -24,9 +25,10 @@ await build({ format: "esm", jsx: "transform", minify: true, - external: ["*.png", "*.woff", "*.woff2", "*.ttf", "*.jpeg", "*.jpg", "*.svg"], sourcemap: true, logLevel: "error", + assetNames: `[name]`, + loader: { ".woff": "file", ".ttf": "file", ".woff2": "file" }, define: { "process.env.NODE_ENV": `"production"`, },