diff --git a/.eslintrc b/.eslintrc index b0542e5..694894b 100644 --- a/.eslintrc +++ b/.eslintrc @@ -25,7 +25,8 @@ "before": false, "after": true }], - "@typescript-eslint/no-empty-interface": 0 + "@typescript-eslint/no-empty-interface": 0, + "@typescript-eslint/prefer-nullish-coalescing": 0 }, "ignorePatterns": [ "dist/", diff --git a/package.json b/package.json index f6a29ab..ce9cbd1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vite-plugin-webfont-dl", - "version": "3.9.1", + "version": "3.9.2", "description": "Vite plugin for downloading and injecting webfonts", "keywords": [ "vite", diff --git a/src/index-html-processor.ts b/src/index-html-processor.ts index f231c4b..de0ba8e 100644 --- a/src/index-html-processor.ts +++ b/src/index-html-processor.ts @@ -88,7 +88,7 @@ export class IndexHtmlProcessor { private removeWebfontTags(html: string): string { for (const regex of this.webfontRegexes) { const removeRegex = new RegExp('[ \t]*' + regex.source + '(\r\n|\r|\n)?', 'g'); - html = html.replace(removeRegex, ''); + html = html.replace(removeRegex, '$1'); } return html; diff --git a/src/index.ts b/src/index.ts index 485930f..5894cd7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -311,10 +311,12 @@ function viteWebfontDownload( res: ServerResponse, ) => { void (async () => { - res.setHeader('Content-Type', 'text/css'); - try { await loadAndPrepareDevFonts(); + + res.setHeader('Access-Control-Allow-Origin', '*'); + res.setHeader('Content-Type', 'text/css'); + res.end(cssContent); } catch (error) { logger.error( @@ -336,6 +338,7 @@ function viteWebfontDownload( const url = req.originalUrl?.replace(/[?#].*$/, ''); res.setHeader('Access-Control-Allow-Origin', '*'); + res.setHeader('Content-Type', 'font/' + (url?.replace(/^.*\./, '') || 'woff2')); res.end( await downloadFont(