Unverified Commit 7bc28538 authored by Hannes Bornö's avatar Hannes Bornö Committed by GitHub

Font loader call json parsing fix (#41052)

Stringify into one json object instead. Previously parsing would break if a string included a semicolon.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have a helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have a helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The "examples guidelines" are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md)
parent fa96d870
...@@ -36,21 +36,26 @@ impl<'a> FontImportsGenerator<'a> { ...@@ -36,21 +36,26 @@ impl<'a> FontImportsGenerator<'a> {
.collect(); .collect();
if let Ok(json) = json { if let Ok(json) = json {
let mut json_values: Vec<String> =
json.iter().map(|value| value.to_string()).collect();
let function_name = match &font_function.function_name { let function_name = match &font_function.function_name {
Some(function) => String::from(&**function), Some(function) => String::from(&**function),
None => String::new(), None => String::new(),
}; };
let mut values = vec![self.relative_path.to_string(), function_name]; let mut query_json_values = serde_json::Map::new();
values.append(&mut json_values); query_json_values.insert(
String::from("path"),
Value::String(self.relative_path.to_string()),
);
query_json_values
.insert(String::from("import"), Value::String(function_name));
query_json_values.insert(String::from("arguments"), Value::Array(json));
let query_json = Value::Object(query_json_values);
return Some(ImportDecl { return Some(ImportDecl {
src: Box::new(Str { src: Box::new(Str {
value: JsWord::from(format!( value: JsWord::from(format!(
"{}/target.css?{}", "{}/target.css?{}",
font_function.loader, font_function.loader, query_json
values.join(";")
)), )),
raw: None, raw: None,
span: DUMMY_SP, span: DUMMY_SP,
......
import firaCode from "@next/font/google/target.css?pages/test.tsx;Abel"; import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}';
import inter from "@next/font/google/target.css?pages/test.tsx;Inter"; import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
export { firaCode }; export { firaCode };
export { inter }; export { inter };
import inter1 from '@next/font/google/target.css?pages/test.tsx;Inter;{"variant":"400"}'; import inter1 from '@next/font/google/target.css?{"arguments":[{"variant":"400"}],"import":"Inter","path":"pages/test.tsx"}';
import inter2 from '@next/font/google/target.css?pages/test.tsx;Inter;{"variant":"400"}'; import inter2 from '@next/font/google/target.css?{"arguments":[{"variant":"400"}],"import":"Inter","path":"pages/test.tsx"}';
var i = 10; var i = 10;
var i2 = 20; var i2 = 20;
import a from "@next/font/google/target.css?pages/test.tsx;ABeeZee;{}"; import a from '@next/font/google/target.css?{"arguments":[{}],"import":"ABeeZee","path":"pages/test.tsx"}';
import a from "@next/font/google/target.css?pages/test.tsx;ABeeZee;{}"; import a from '@next/font/google/target.css?{"arguments":[{}],"import":"ABeeZee","path":"pages/test.tsx"}';
import a from "@next/font/google/target.css?pages/test.tsx;ABeeZee;{}"; import a from '@next/font/google/target.css?{"arguments":[{}],"import":"ABeeZee","path":"pages/test.tsx"}';
import a from "@next/font/google/target.css?pages/test.tsx;ABeeZee;{}"; import a from '@next/font/google/target.css?{"arguments":[{}],"import":"ABeeZee","path":"pages/test.tsx"}';
const a = fn({ const a = fn({
10: 'hello' 10: 'hello'
}); });
......
import inter from "@next/font/google/target.css?pages/test.tsx;Inter;{};[]"; import inter from '@next/font/google/target.css?{"arguments":[{},[]],"import":"Inter","path":"pages/test.tsx"}';
const a = fn(...{}, ...[]); const a = fn(...{}, ...[]);
import font from 'cool-fonts/target.css?pages/test.tsx;;{"prop":true}'; import font from 'cool-fonts/target.css?{"arguments":[{"prop":true}],"import":"","path":"pages/test.tsx"}';
import firaCode from "@next/font/google/target.css?pages/test.tsx;Abel"; import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}';
import inter from "@next/font/google/target.css?pages/test.tsx;Inter"; import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
export { firaCode }; export { firaCode };
export { inter }; export { inter };
import firaCode from "@next/font/google/target.css?pages/test.tsx;Abel"; import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}';
import inter from "@next/font/google/target.css?pages/test.tsx;Inter"; import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
export { firaCode }; export { firaCode };
export default inter; export default inter;
import firaCode from '@next/font/google/target.css?pages/test.tsx;Fira_Code;{"fallback":["system-ui",{"key":false},[]],"key":{"key2":{}},"preload":true,"variant":"400"}'; import firaCode from '@next/font/google/target.css?{"arguments":[{"fallback":["system-ui",{"key":false},[]],"key":{"key2":{}},"preload":true,"variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
console.log(firaCode); console.log(firaCode);
import acme1 from 'cool-fonts/target.css?pages/test.tsx;Acme;{"variant":"400"}'; import acme1 from 'cool-fonts/target.css?{"arguments":[{"variant":"400"}],"import":"Acme","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
import geo from '@next/font/google/target.css?pages/test.tsx;Geo;"test";[1.0];{"a":2.0};3.0'; import geo from '@next/font/google/target.css?{"arguments":["test",[1.0],{"a":2.0},3.0],"import":"Geo","path":"pages/test.tsx"}';
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"display":"swap","variant":"900"}'; import inter from '@next/font/google/target.css?{"arguments":[{"display":"swap","variant":"900"}],"import":"Inter","path":"pages/test.tsx"}';
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"display":"swap","variant":"900"}'; import inter from '@next/font/google/target.css?{"arguments":[{"display":"swap","variant":"900"}],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"variant":"900"}'; import inter from '@next/font/google/target.css?{"arguments":[{"variant":"900"}],"import":"Inter","path":"pages/test.tsx"}';
import fira from 'cool-fonts/target.css?pages/test.tsx;Fira_Code;{"display":"swap","variant":"400"}'; import fira from 'cool-fonts/target.css?{"arguments":[{"display":"swap","variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
import firaCode from '@next/font/google/target.css?pages/test.tsx;Fira_Code;{"fallback":["system-ui"],"variant":"400"}'; import firaCode from '@next/font/google/target.css?{"arguments":[{"fallback":["system-ui"],"variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}';
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"display":"swap","variant":"900"}'; import inter from '@next/font/google/target.css?{"arguments":[{"display":"swap","variant":"900"}],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"variant":"900"}'; import inter from '@next/font/google/target.css?{"arguments":[{"variant":"900"}],"import":"Inter","path":"pages/test.tsx"}';
import fira from '@next/font/google/target.css?pages/test.tsx;Fira_Code;{"display":"swap","variant":"400"}'; import fira from '@next/font/google/target.css?{"arguments":[{"display":"swap","variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}';
import React from 'react'; import React from 'react';
import fira from "@next/font/google/target.css?pages/test.tsx;Fira_Code"; import fira from '@next/font/google/target.css?{"arguments":[],"import":"Fira_Code","path":"pages/test.tsx"}';
...@@ -32,11 +32,12 @@ export default async function nextFontLoader(this: any) { ...@@ -32,11 +32,12 @@ export default async function nextFontLoader(this: any) {
return outputPath return outputPath
} }
// next-swc next_font_loaders turns each function call argument into JSON seperated by semicolons // next-swc next_font_loaders turns each font loader call into JSON
let [relativeFilePathFromRoot, functionName, ...data] = this.resourceQuery const {
.slice(1) path: relativeFilePathFromRoot,
.split(';') import: functionName,
data = data.map((value: string) => JSON.parse(value)) arguments: data,
} = JSON.parse(this.resourceQuery.slice(1))
try { try {
const fontLoader: FontLoader = require(path.join( const fontLoader: FontLoader = require(path.join(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment