next-font 1.2.0 → 1.2.1

package/dist/google/index.js

@@ -1 +1 @@
-
+export{};

package/dist/google/loader.d.ts

@@ -1,40 +1,6 @@
-type FontLoaderOptions = Omit<{
-    functionName: string;
-    variableName: string;
-    data: any[];
-    emitFontFile: (content: Buffer, ext: string, preload: boolean, isUsingSizeAdjust?: boolean) => string;
-    resolve: (src: string) => string;
-    isDev: boolean;
-    isServer: boolean;
-    loaderContext: any;
-}, 'loaderContext'> & {
-    loaderContext: {
-        fs?: {
-            readFile: (...args: any[]) => Promise<Buffer | Uint8Array | string>;
-        };
-        error: (message: string) => any;
-    };
-    cache?: {
-        css?: Map<string, string | null>;
-        font?: Map<string, string | null>;
-    };
-};
-type FontLoader = (options: FontLoaderOptions) => Promise<{
-    css: string;
-    fallbackFonts?: string[];
-    variable?: string;
-    adjustFontFallback?: AdjustFontFallback;
-    weight?: string;
-    style?: string;
-}>;
-type AdjustFontFallback = {
-    fallbackFont: string;
-    ascentOverride?: string;
-    descentOverride?: string;
-    lineGapOverride?: string;
-    sizeAdjust?: string;
-};
+import { n as FontLoader } from "../declarations-D084A7_6.js";
 
+//#region src/google/loader.d.ts
 declare const loader: FontLoader;
-
-export { loader as default };
+//#endregion
+export { loader as default };

package/dist/google/loader.js

@@ -1,9 +1,8 @@
-import{nextFontError as e}from"../next-font-error.js";import{findFontFilesInCss as t}from"./find-font-files-in-css.js";import{getFontAxes as o}from"./get-font-axes.js";import{getGoogleFontsUrl as l}from"./get-google-fonts-url.js";import{validateGoogleFontFunctionCall as a}from"./validate-google-font-function-call.js";let r=e=>{let t;return()=>(t||(t=e().then(e=>(t=e,e))),t)},n=/[|\\{}()[\]^$+*?.-]/,s=/[|\\{}()[\]^$+*?.-]/g,i=e=>n.test(e)?e.replace(s,"\\$&"):e,f=r(()=>import("./get-fallback-font-override-metrics.js").then(e=>e.default||e)),c=r(()=>import("./fetch-css-from-google-fonts.js").then(e=>e.default||e)),d=r(()=>import("./fetch-font-file.js").then(e=>e.default||e)),u=async({functionName:r,data:n,emitFontFile:s,isDev:u,isServer:g,loaderContext:m,cache:{css:h,font:p}={}})=>{let{fontFamily:w,weights:$,styles:v,display:F,preload:j,selectedVariableAxes:y,fallback:b,adjustFontFallback:x,variable:k,subsets:G}=a(r,n[0]),O=o(w,$,v,y),z=l(w,O,F),A=x?await (async()=>{let{getFallbackFontOverrideMetrics:e}=await f();return e(w)})():void 0,E={fallbackFonts:b,weight:1===$.length&&"variable"!==$[0]?$[0]:void 0,style:1===v.length?v[0]:void 0,variable:k,adjustFontFallback:A};try{let o=h?.has(z),l=null!=h&&o?h.get(z):await (async()=>{let{fetchCSSFromGoogleFonts:e}=await c();return await e(z,w,u).catch(e=>(console.error(e),null))})();o?h?.delete(z):h?.set(z,l??null),null==l&&e(`Failed to fetch \`${w}\` from Google Fonts.`),l=l.split("body {",1)[0];let a=t(l,j?G:void 0),r=await Promise.all(a.map(async({googleFontFileUrl:t,preloadFontFile:o})=>{let l=p?.has(t),a=null!=p&&l?p.get(t):await (async()=>{let{fetchFontFile:e}=await d();return await e(t,u).catch(e=>(console.error(e),null))})();l?p?.delete(t):p?.set(t,a??null),null==a&&e(`Failed to fetch \`${w}\` from Google Fonts.`);let r=/\.(woff|woff2|eot|ttf|otf)$/.exec(t)[1],n=s(a,r,o,!!A);return{googleFontFileUrl:t,selfHostedFileUrl:n}})),n=l;for(let{googleFontFileUrl:e,selfHostedFileUrl:t}of r)n=n.replace(RegExp(i(e),"g"),t);return{...E,css:n}}catch(e){if(u){g&&m.error(`Failed to download \`${w}\` from Google Fonts. Using fallback font instead.
-
-${e.message}}`);let t=`@font-face {
-  font-family: '${w} Fallback';
-  src: local("${A?.fallbackFont??"Arial"}");`;return A&&(t+=`
-  ascent-override:${A.ascentOverride};
-  descent-override:${A.descentOverride};
-  line-gap-override:${A.lineGapOverride};
-  size-adjust:${A.sizeAdjust};`),t+="\n}",{...E,css:t}}throw e}};export{u as default};
+import{n as e,t}from"../utils-Vxow00oE.js";import{nextFontError as n}from"../next-font-error.js";import{findFontFilesInCss as r}from"./find-font-files-in-css.js";import{getFontAxes as i}from"./get-font-axes.js";import{getGoogleFontsUrl as a}from"./get-google-fonts-url.js";import{validateGoogleFontFunctionCall as o}from"./validate-google-font-function-call.js";const s=n,c=t(()=>import(`./get-fallback-font-override-metrics.js`).then(e=>e.default||e)),l=t(()=>import(`./fetch-css-from-google-fonts.js`).then(e=>e.default||e)),u=t(()=>import(`./fetch-font-file.js`).then(e=>e.default||e)),d=async({functionName:t,data:n,emitFontFile:d,isDev:f,isServer:p,loaderContext:m,cache:{css:h,font:g}={}})=>{let{fontFamily:_,weights:v,styles:y,display:b,preload:x,selectedVariableAxes:S,fallback:C,adjustFontFallback:w,variable:T,subsets:E}=o(t,n[0]),D=a(_,i(_,v,y,S),b),O=w?await(async()=>{let{getFallbackFontOverrideMetrics:e}=await c();return e(_)})():void 0,k={fallbackFonts:C,weight:v.length===1&&v[0]!==`variable`?v[0]:void 0,style:y.length===1?y[0]:void 0,variable:T,adjustFontFallback:O};try{let t=h?.has(D),n=h!=null&&t?h.get(D):await(async()=>{let{fetchCSSFromGoogleFonts:e}=await l();return await e(D,_,f).catch(e=>(console.error(e),null))})();t?h?.delete(D):h?.set(D,n??null),n??s(`Failed to fetch \`${_}\` from Google Fonts.`),n=n.split(`body {`,1)[0];let i=r(n,x?E:void 0),a=await Promise.all(i.map(async({googleFontFileUrl:e,preloadFontFile:t})=>{let n=g?.has(e),r=g!=null&&n?g.get(e):await(async()=>{let{fetchFontFile:t}=await u();return await t(e,f).catch(e=>(console.error(e),null))})();n?g?.delete(e):g?.set(e,r??null),r??s(`Failed to fetch \`${_}\` from Google Fonts.`);let i=/\.(woff|woff2|eot|ttf|otf)$/.exec(e)[1];return{googleFontFileUrl:e,selfHostedFileUrl:d(r,i,t,!!O)}})),o=n;for(let{googleFontFileUrl:t,selfHostedFileUrl:n}of a)o=o.replace(new RegExp(e(t),`g`),n);return{...k,css:o}}catch(e){if(f){p&&m.error(`Failed to download \`${_}\` from Google Fonts. Using fallback font instead.\n\n${e.message}}`);let t=`@font-face {
+  font-family: '${_} Fallback';
+  src: local("${O?.fallbackFont??`Arial`}");`;return O&&(t+=`
+  ascent-override:${O.ascentOverride};
+  descent-override:${O.descentOverride};
+  line-gap-override:${O.lineGapOverride};
+  size-adjust:${O.sizeAdjust};`),t+=`
+}`,{...k,css:t}}else throw e}};export{d as default};

package/dist/google/retry.js

@@ -1,3 +1 @@
-import t from"node:url";import e from"node:path";var r,o,i={exports:{}};let n=t.fileURLToPath(import.meta.url),s=e.dirname(n);var u=(r=function(){if(o)return i.exports;o=1;var t={632:(t,e,r)=>{var o=r(862);t.exports=function(t,e){return new Promise(function(r,i){var n=e||{},s=o.operation(n);function u(t){i(t||Error("Aborted"))}function a(t,e){if(t.bail)return void u(t);s.retry(t)?n.onRetry&&n.onRetry(t,e):i(s.mainError())}s.attempt(function(e){var o;try{o=t(u,e)}catch(t){a(t,e);return}Promise.resolve(o).then(r).catch(function(t){a(t,e)})})})}},862:(t,e,r)=>{t.exports=r(97)},97:(t,e,r)=>{var o=r(848);e.operation=function(t){return new o(e.timeouts(t),{forever:t&&t.forever,unref:t&&t.unref,maxRetryTime:t&&t.maxRetryTime})},e.timeouts=function(t){if(t instanceof Array)return[].concat(t);var e={retries:10,factor:2,minTimeout:1e3,maxTimeout:1/0,randomize:!1};for(var r in t)e[r]=t[r];if(e.minTimeout>e.maxTimeout)throw Error("minTimeout is greater than maxTimeout");for(var o=[],i=0;i<e.retries;i++)o.push(this.createTimeout(i,e));return t&&t.forever&&!o.length&&o.push(this.createTimeout(i,e)),o.sort(function(t,e){return t-e}),o},e.createTimeout=function(t,e){var r=Math.round((e.randomize?Math.random()+1:1)*e.minTimeout*Math.pow(e.factor,t));return Math.min(r,e.maxTimeout)},e.wrap=function(t,r,o){if(r instanceof Array&&(o=r,r=null),!o)for(var i in o=[],t)"function"==typeof t[i]&&o.push(i);for(var n=0;n<o.length;n++){var s=o[n],u=t[s];t[s]=(function(o){var i=e.operation(r),n=Array.prototype.slice.call(arguments,1),s=n.pop();n.push(function(t){i.retry(t)||(t&&(arguments[0]=i.mainError()),s.apply(this,arguments))}),i.attempt(function(){o.apply(t,n)})}).bind(t,u),t[s].options=r}}},848:t=>{function e(t,e){"boolean"==typeof e&&(e={forever:e}),this._originalTimeouts=JSON.parse(JSON.stringify(t)),this._timeouts=t,this._options=e||{},this._maxRetryTime=e&&e.maxRetryTime||1/0,this._fn=null,this._errors=[],this._attempts=1,this._operationTimeout=null,this._operationTimeoutCb=null,this._timeout=null,this._operationStart=null,this._options.forever&&(this._cachedTimeouts=this._timeouts.slice(0))}t.exports=e,e.prototype.reset=function(){this._attempts=1,this._timeouts=this._originalTimeouts},e.prototype.stop=function(){this._timeout&&clearTimeout(this._timeout),this._timeouts=[],this._cachedTimeouts=null},e.prototype.retry=function(t){if(this._timeout&&clearTimeout(this._timeout),!t)return!1;var e=(new Date).getTime();if(t&&e-this._operationStart>=this._maxRetryTime)return this._errors.unshift(Error("RetryOperation timeout occurred")),!1;this._errors.push(t);var r=this._timeouts.shift();if(void 0===r)if(!this._cachedTimeouts)return!1;else this._errors.splice(this._errors.length-1,this._errors.length),this._timeouts=this._cachedTimeouts.slice(0),r=this._timeouts.shift();var o=this,i=setTimeout(function(){o._attempts++,o._operationTimeoutCb&&(o._timeout=setTimeout(function(){o._operationTimeoutCb(o._attempts)},o._operationTimeout),o._options.unref&&o._timeout.unref()),o._fn(o._attempts)},r);return this._options.unref&&i.unref(),!0},e.prototype.attempt=function(t,e){this._fn=t,e&&(e.timeout&&(this._operationTimeout=e.timeout),e.cb&&(this._operationTimeoutCb=e.cb));var r=this;this._operationTimeoutCb&&(this._timeout=setTimeout(function(){r._operationTimeoutCb()},r._operationTimeout)),this._operationStart=(new Date).getTime(),this._fn(this._attempts)},e.prototype.try=function(t){console.log("Using RetryOperation.try() is deprecated"),this.attempt(t)},e.prototype.start=function(t){console.log("Using RetryOperation.start() is deprecated"),this.attempt(t)},e.prototype.start=e.prototype.try,e.prototype.errors=function(){return this._errors},e.prototype.attempts=function(){return this._attempts},e.prototype.mainError=function(){if(0===this._errors.length)return null;for(var t={},e=null,r=0,o=0;o<this._errors.length;o++){var i=this._errors[o],n=i.message,s=(t[n]||0)+1;t[n]=s,s>=r&&(e=i,r=s)}return e}}},e={};function r(o){var i=e[o];if(void 0!==i)return i.exports;var n=e[o]={exports:{}},s=!0;try{t[o](n,n.exports,r),s=!1}finally{s&&delete e[o]}return n.exports}return r.ab=s+"/",i.exports=r(632),i.exports}())&&r.__esModule&&Object.prototype.hasOwnProperty.call(r,"default")?r.default:r;async function a(t,e){return await u(t,{retries:e,onRetry(t,r){console.error(t.message+`
-
-Retrying ${r}/${e}...`)},minTimeout:100})}export{a as retry};
+import{r as e,t}from"../chunk-9UNmgxP_.js";var n=e(t(((e,t)=>{(()=>{var e={632:(e,t,n)=>{var r=n(862);function i(e,t){function n(n,i){var a=t||{},o=r.operation(a);function s(e){i(e||Error(`Aborted`))}function c(e,t){if(e.bail){s(e);return}o.retry(e)?a.onRetry&&a.onRetry(e,t):i(o.mainError())}function l(t){var r;try{r=e(s,t)}catch(e){c(e,t);return}Promise.resolve(r).then(n).catch((function(e){c(e,t)}))}o.attempt(l)}return new Promise(n)}e.exports=i},862:(e,t,n)=>{e.exports=n(97)},97:(e,t,n)=>{var r=n(848);t.operation=function(e){return new r(t.timeouts(e),{forever:e&&e.forever,unref:e&&e.unref,maxRetryTime:e&&e.maxRetryTime})},t.timeouts=function(e){if(e instanceof Array)return[].concat(e);var t={retries:10,factor:2,minTimeout:1*1e3,maxTimeout:1/0,randomize:!1};for(var n in e)t[n]=e[n];if(t.minTimeout>t.maxTimeout)throw Error(`minTimeout is greater than maxTimeout`);for(var r=[],i=0;i<t.retries;i++)r.push(this.createTimeout(i,t));return e&&e.forever&&!r.length&&r.push(this.createTimeout(i,t)),r.sort((function(e,t){return e-t})),r},t.createTimeout=function(e,t){var n=t.randomize?Math.random()+1:1,r=Math.round(n*t.minTimeout*t.factor**+e);return r=Math.min(r,t.maxTimeout),r},t.wrap=function(e,n,r){if(n instanceof Array&&(r=n,n=null),!r)for(var i in r=[],e)typeof e[i]==`function`&&r.push(i);for(var a=0;a<r.length;a++){var o=r[a],s=e[o];e[o]=function(r){var i=t.operation(n),a=Array.prototype.slice.call(arguments,1),o=a.pop();a.push((function(e){i.retry(e)||(e&&(arguments[0]=i.mainError()),o.apply(this,arguments))})),i.attempt((function(){r.apply(e,a)}))}.bind(e,s),e[o].options=n}}},848:e=>{function t(e,t){typeof t==`boolean`&&(t={forever:t}),this._originalTimeouts=JSON.parse(JSON.stringify(e)),this._timeouts=e,this._options=t||{},this._maxRetryTime=t&&t.maxRetryTime||1/0,this._fn=null,this._errors=[],this._attempts=1,this._operationTimeout=null,this._operationTimeoutCb=null,this._timeout=null,this._operationStart=null,this._options.forever&&(this._cachedTimeouts=this._timeouts.slice(0))}e.exports=t,t.prototype.reset=function(){this._attempts=1,this._timeouts=this._originalTimeouts},t.prototype.stop=function(){this._timeout&&clearTimeout(this._timeout),this._timeouts=[],this._cachedTimeouts=null},t.prototype.retry=function(e){if(this._timeout&&clearTimeout(this._timeout),!e)return!1;var t=new Date().getTime();if(e&&t-this._operationStart>=this._maxRetryTime)return this._errors.unshift(Error(`RetryOperation timeout occurred`)),!1;this._errors.push(e);var n=this._timeouts.shift();if(n===void 0)if(this._cachedTimeouts)this._errors.splice(this._errors.length-1,this._errors.length),this._timeouts=this._cachedTimeouts.slice(0),n=this._timeouts.shift();else return!1;var r=this,i=setTimeout((function(){r._attempts++,r._operationTimeoutCb&&(r._timeout=setTimeout((function(){r._operationTimeoutCb(r._attempts)}),r._operationTimeout),r._options.unref&&r._timeout.unref()),r._fn(r._attempts)}),n);return this._options.unref&&i.unref(),!0},t.prototype.attempt=function(e,t){this._fn=e,t&&(t.timeout&&(this._operationTimeout=t.timeout),t.cb&&(this._operationTimeoutCb=t.cb));var n=this;this._operationTimeoutCb&&(this._timeout=setTimeout((function(){n._operationTimeoutCb()}),n._operationTimeout)),this._operationStart=new Date().getTime(),this._fn(this._attempts)},t.prototype.try=function(e){console.log(`Using RetryOperation.try() is deprecated`),this.attempt(e)},t.prototype.start=function(e){console.log(`Using RetryOperation.start() is deprecated`),this.attempt(e)},t.prototype.start=t.prototype.try,t.prototype.errors=function(){return this._errors},t.prototype.attempts=function(){return this._attempts},t.prototype.mainError=function(){if(this._errors.length===0)return null;for(var e={},t=null,n=0,r=0;r<this._errors.length;r++){var i=this._errors[r],a=i.message,o=(e[a]||0)+1;e[a]=o,o>=n&&(t=i,n=o)}return t}}},n={};function r(t){var i=n[t];if(i!==void 0)return i.exports;var a=n[t]={exports:{}},o=!0;try{e[t](a,a.exports,r),o=!1}finally{o&&delete n[t]}return a.exports}r!==void 0&&(r.ab=__dirname+`/`),t.exports=r(632)})()}))());async function r(e,t){return await(0,n.default)(e,{retries:t,onRetry(e,n){console.error(e.message+`\n\nRetrying ${n}/${t}...`)},minTimeout:100})}export{r as retry};

package/dist/google/sort-fonts-variant-values.js

@@ -1 +1 @@
-function t(t,n){if(t.includes(",")&&n.includes(",")){let[e,r]=t.split(",",2),[s,a]=n.split(",",2);return e===s?parseInt(r)-parseInt(a):parseInt(e)-parseInt(s)}return parseInt(t)-parseInt(n)}export{t as sortFontsVariantValues};
+function e(e,t){if(e.includes(`,`)&&t.includes(`,`)){let[n,r]=e.split(`,`,2),[i,a]=t.split(`,`,2);return n===i?parseInt(r)-parseInt(a):parseInt(n)-parseInt(i)}return parseInt(e)-parseInt(t)}export{e as sortFontsVariantValues};

package/dist/google/validate-google-font-function-call.js

@@ -1,9 +1 @@
-import{allowedDisplayValues as e}from"../constants.js";import{formatAvailableValues as s}from"../format-available-values.js";import{nextFontError as a}from"../next-font-error.js";import{googleFontsMetadata as t}from"./google-fonts-metadata.js";function n(n,l){let{weight:o,style:i,preload:r=!0,display:f="swap",axes:b,fallback:d,adjustFontFallback:u=!0,variable:g,subsets:c}=l||{};""===n&&a("next/font/google has no default export");let h=n.replace(/_/g," "),v=t[h];v||a(`Unknown font \`${h}\``);let p=v.subsets;0===p.length?r=!1:r&&(c||a(`Preload is enabled but no subsets were specified for font \`${h}\`. Please specify subsets or disable preloading if your intended subset can't be preloaded.
-Available subsets: ${s(p)}
-
-Read more: https://nextjs.org/docs/messages/google-fonts-missing-subsets`),c.forEach(e=>{p.includes(e)||a(`Unknown subset \`${e}\` for font \`${h}\`.
-Available subsets: ${s(p)}`)}));let $=v.weights,w=v.styles,y=o?[...new Set(Array.isArray(o)?o:[o])]:[],m=i?[...new Set(Array.isArray(i)?i:[i])]:[];return 0===y.length&&($.includes("variable")?y.push("variable"):a(`Missing weight for font \`${h}\`.
-Available weights: ${s($)}`)),y.length>1&&y.includes("variable")&&a(`Unexpected \`variable\` in weight array for font \`${h}\`. You only need \`variable\`, it includes all available weights.`),y.forEach(e=>{$.includes(e)||a(`Unknown weight \`${e}\` for font \`${h}\`.
-Available weights: ${s($)}`)}),0===m.length&&(1===w.length?m.push(w[0]):m.push("normal")),m.forEach(e=>{w.includes(e)||a(`Unknown style \`${e}\` for font \`${h}\`.
-Available styles: ${s(w)}`)}),e.includes(f)||a(`Invalid display value \`${f}\` for font \`${h}\`.
-Available display values: ${s(e)}`),b&&($.includes("variable")||a("Axes can only be defined for variable fonts."),"variable"!==y[0]&&a("Axes can only be defined for variable fonts when the weight property is nonexistent or set to `variable`.")),{fontFamily:h,weights:y,styles:m,display:f,preload:r,selectedVariableAxes:b,fallback:d,adjustFontFallback:u,variable:g,subsets:c}}export{n as validateGoogleFontFunctionCall};
+import{formatAvailableValues as e}from"../format-available-values.js";import{allowedDisplayValues as t}from"../constants.js";import{nextFontError as n}from"../next-font-error.js";import{t as r}from"../google-fonts-metadata-uXngxjL5.js";function i(i,a){let{weight:o,style:s,preload:c=!0,display:l=`swap`,axes:u,fallback:d,adjustFontFallback:f=!0,variable:p,subsets:m}=a||{};i===``&&n(`next-font/google has no default export`);let h=i.replace(/_/g,` `),g=r[h];g||n(`Unknown font \`${h}\``);let _=g.subsets;_.length===0?c=!1:c&&(m||n(`Preload is enabled but no subsets were specified for font \`${h}\`. Please specify subsets or disable preloading if your intended subset can't be preloaded.\nAvailable subsets: ${e(_)}\n\nRead more: https://nextjs.org/docs/messages/google-fonts-missing-subsets`),m.forEach(t=>{_.includes(t)||n(`Unknown subset \`${t}\` for font \`${h}\`.\nAvailable subsets: ${e(_)}`)}));let v=g.weights,y=g.styles,b=o?[...new Set(Array.isArray(o)?o:[o])]:[],x=s?[...new Set(Array.isArray(s)?s:[s])]:[];return b.length===0&&(v.includes(`variable`)?b.push(`variable`):n(`Missing weight for font \`${h}\`.\nAvailable weights: ${e(v)}`)),b.length>1&&b.includes(`variable`)&&n(`Unexpected \`variable\` in weight array for font \`${h}\`. You only need \`variable\`, it includes all available weights.`),b.forEach(t=>{v.includes(t)||n(`Unknown weight \`${t}\` for font \`${h}\`.\nAvailable weights: ${e(v)}`)}),x.length===0&&(y.length===1?x.push(y[0]):x.push(`normal`)),x.forEach(t=>{y.includes(t)||n(`Unknown style \`${t}\` for font \`${h}\`.\nAvailable styles: ${e(y)}`)}),t.includes(l)||n(`Invalid display value \`${l}\` for font \`${h}\`.\nAvailable display values: ${e(t)}`),u&&(v.includes(`variable`)||n(`Axes can only be defined for variable fonts.`),b[0]!==`variable`&&n("Axes can only be defined for variable fonts when the weight property is nonexistent or set to `variable`.")),{fontFamily:h,weights:b,styles:x,display:l,preload:c,selectedVariableAxes:u,fallback:d,adjustFontFallback:f,variable:p,subsets:m}}export{i as validateGoogleFontFunctionCall};