Merge commit '712347b0966ea473b86c33b62dabd91185fbe2e7' into feature/…

…entry-battery-level-check

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Project Changelog
 
+# [3.0.0-next.23](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v3.0.0-next.22...v3.0.0-next.23) (2023-09-13)
+
+
+### Bug Fixes
+
+* **module:** improve critters handling ([315e2fe](https://github.com/GrabarzUndPartner/nuxt-speedkit/commit/315e2fe5aa764ba9da424e26d14eb5bb088ddb70))
+
 # [3.0.0-next.22](https://github.com/GrabarzUndPartner/nuxt-speedkit/compare/v3.0.0-next.21...v3.0.0-next.22) (2023-09-13)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-speedkit",
-  "version": "3.0.0-next.22",
+  "version": "3.0.0-next.23",
   "description": "Nuxt Speedkit takes over the Lighthouse performance optimization of your generated website.",
   "license": "MIT",
   "contributors": [
@@ -69,7 +69,7 @@
     "@commitlint/config-conventional": "17.7.0",
     "@fullhuman/postcss-purgecss": "5.0.0",
     "@nuxt/module-builder": "0.5.1",
-    "@nuxt/webpack-builder": "3.7.1",
+    "@nuxt/webpack-builder": "3.7.2",
     "@nuxtjs/eslint-config": "12.0.0",
     "@nuxtjs/eslint-module": "4.1.0",
     "@nuxtjs/stylelint-module": "5.1.0",
@@ -90,7 +90,7 @@
     "husky": "8.0.3",
     "jsdom": "22.1.0",
     "lint-staged": "14.0.1",
-    "nuxt": "^3.7.2",
+    "nuxt": "3.7.2",
     "pinst": "3.0.0",
     "playwright": "1.37.1",
     "postcss-functions": "4.0.2",

src/module.mjs

@@ -112,7 +112,8 @@ async function addBuildTemplates(nuxt, options) {
 
   addTemplate({
     filename: MODULE_NAME + '/fonts.css',
-    getContents: () => fontConfig.toCSS(),
+    getContents: () =>
+      `/*! speedkit-font-faces start */${fontConfig.toCSS()}/*! speedkit-font-faces end */`,
     write: true
   });
 

src/runtime/classes/Font.mjs

@@ -50,10 +50,12 @@ export default class Font {
 
   getCSSText({ usedFontaine = false } = {}) {
     const selector = createSelector(this.rootSelector, this.selector);
-    const family = prepareFamily(this.family, { usedFontaine });
+    const family = `"${this.family}"`;
     return wrapByMedia(
       `${selector} {
-        font-family: ${this.fallbackFamily.join(', ')};
+        font-family: ${[getFontaineFallback(this.family, usedFontaine)]
+          .filter(Boolean)
+          .concat(this.fallbackFamily.join(', '))};
         font-weight: ${this.weight};
         font-style: ${this.style};
       }
@@ -64,9 +66,9 @@ export default class Font {
     );
   }
 
-  getNoScriptCSSText({ usedFontaine = false } = {}) {
+  getNoScriptCSSText() {
     const selector = createSelector(this.rootSelector, this.selector);
-    const family = prepareFamily(this.family, { usedFontaine });
+    const family = `"${this.family}"`;
     return wrapByMedia(
       `${selector} {
         font-family: ${[family].concat(this.fallbackFamily).join(', ')};
@@ -123,9 +125,9 @@ function weightNormalize(weight) {
   }
 }
 
-function prepareFamily(family, { usedFontaine = false } = {}) {
-  if (!usedFontaine) {
-    return `"${family}"`;
+function getFontaineFallback(family, usedFontaine) {
+  if (usedFontaine) {
+    return `"${family} fallback"`;
   }
-  return `"${family}", "${family} fallback"`;
+  return '';
 }

src/runtime/classes/FontCollection.mjs

@@ -50,10 +50,10 @@ export default class FontCollection {
     ]);
   }
 
-  getNoScriptStyleDescriptions(options) {
+  getNoScriptStyleDescriptions() {
     return getRelevantDescriptions([
       getStyleDescription(
-        this.list.map(font => font.getNoScriptCSSText(options)).join(' '),
+        this.list.map(font => font.getNoScriptCSSText()).join(' '),
         true
       )
     ]);

src/runtime/composables/fonts.mjs

@@ -40,7 +40,7 @@ function writeHead(isCritical, fontCollection, runtimeConfig) {
       return fontCollection.getStyleDescriptions(options);
     }),
     noscript: computed(() => {
-      return fontCollection.getNoScriptStyleDescriptions(options);
+      return fontCollection.getNoScriptStyleDescriptions();
     })
   });
 }