Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Font loader call json parsing fix #41052

Merged
merged 4 commits into from Sep 30, 2022
Merged

Font loader call json parsing fix #41052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58d770d
Stringify into one JSON object
Sep 30, 2022
fd21a69
Update fixtures
Sep 30, 2022
bc4710c
Merge branch 'canary' into next-font-loader-json
Sep 30, 2022
33c59b9
Merge branch 'canary' into next-font-loader-json
kodiakhq[bot] Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions packages/next-swc/crates/core/src/next_font_loaders/font_imports_generator.rs
View file
Open in desktop
Expand Up @@ -36,21 +36,26 @@ impl<'a> FontImportsGenerator<'a> {
.collect();

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 {
Some(function) => String::from(&**function),
None => String::new(),
};
let mut values = vec![self.relative_path.to_string(), function_name];
values.append(&mut json_values);
let mut query_json_values = serde_json::Map::new();
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 {
src: Box::new(Str {
value: JsWord::from(format!(
"{}/target.css?{}",
font_function.loader,
values.join(";")
font_function.loader, query_json
)),
raw: None,
span: DUMMY_SP,
Expand Down
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/tests/errors/next-font-loaders/export-let/output.js
View file
Open in desktop
@@ -1,5 +1,5 @@
import firaCode from "@next/font/google/target.css?pages/test.tsx;Abel";
import inter from "@next/font/google/target.css?pages/test.tsx;Inter";
import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}';
import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react';
export { firaCode };
export { inter };
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/tests/errors/next-font-loaders/not-const/output.js
View file
Open in desktop
@@ -1,4 +1,4 @@
import inter1 from '@next/font/google/target.css?pages/test.tsx;Inter;{"variant":"400"}';
import inter2 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?{"arguments":[{"variant":"400"}],"import":"Inter","path":"pages/test.tsx"}';
var i = 10;
var i2 = 20;
8 changes: 4 additions & 4 deletions packages/next-swc/crates/core/tests/errors/next-font-loaders/options-object/output.js
View file
Open in desktop
@@ -1,7 +1,7 @@
import a from "@next/font/google/target.css?pages/test.tsx;ABeeZee;{}";
import a from "@next/font/google/target.css?pages/test.tsx;ABeeZee;{}";
import a from "@next/font/google/target.css?pages/test.tsx;ABeeZee;{}";
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?{"arguments":[{}],"import":"ABeeZee","path":"pages/test.tsx"}';
import a from '@next/font/google/target.css?{"arguments":[{}],"import":"ABeeZee","path":"pages/test.tsx"}';
import a from '@next/font/google/target.css?{"arguments":[{}],"import":"ABeeZee","path":"pages/test.tsx"}';
const a = fn({
10: 'hello'
});
Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/crates/core/tests/errors/next-font-loaders/spread-arg/output.js
View file
Open in desktop
@@ -1,2 +1,2 @@
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(...{}, ...[]);
2 changes: 1 addition & 1 deletion packages/next-swc/crates/core/tests/fixture/next-font-loaders/default-import/output.js
View file
Open in desktop
@@ -1 +1 @@
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"}';
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/tests/fixture/next-font-loaders/export-const/output.js
View file
Open in desktop
@@ -1,5 +1,5 @@
import firaCode from "@next/font/google/target.css?pages/test.tsx;Abel";
import inter from "@next/font/google/target.css?pages/test.tsx;Inter";
import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}';
import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react';
export { firaCode };
export { inter };
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/tests/fixture/next-font-loaders/exports/output.js
View file
Open in desktop
@@ -1,5 +1,5 @@
import firaCode from "@next/font/google/target.css?pages/test.tsx;Abel";
import inter from "@next/font/google/target.css?pages/test.tsx;Inter";
import firaCode from '@next/font/google/target.css?{"arguments":[],"import":"Abel","path":"pages/test.tsx"}';
import inter from '@next/font/google/target.css?{"arguments":[],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react';
export { firaCode };
export default inter;
2 changes: 1 addition & 1 deletion packages/next-swc/crates/core/tests/fixture/next-font-loaders/font-options/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
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';
console.log(firaCode);
2 changes: 1 addition & 1 deletion packages/next-swc/crates/core/tests/fixture/next-font-loaders/import-as/output.js
View file
Open in desktop
@@ -1,2 +1,2 @@
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';
2 changes: 1 addition & 1 deletion packages/next-swc/crates/core/tests/fixture/next-font-loaders/many-args/output.js
View file
Open in desktop
@@ -1 +1 @@
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"}';
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/tests/fixture/next-font-loaders/multiple-calls/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"display":"swap","variant":"900"}';
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?{"arguments":[{"display":"swap","variant":"900"}],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react';
4 changes: 2 additions & 2 deletions .../next-swc/crates/core/tests/fixture/next-font-loaders/multiple-font-downloaders/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"variant":"900"}';
import fira from 'cool-fonts/target.css?pages/test.tsx;Fira_Code;{"display":"swap","variant":"400"}';
import inter from '@next/font/google/target.css?{"arguments":[{"variant":"900"}],"import":"Inter","path":"pages/test.tsx"}';
import fira from 'cool-fonts/target.css?{"arguments":[{"display":"swap","variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}';
import React from 'react';
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/tests/fixture/next-font-loaders/multiple-fonts/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
import firaCode from '@next/font/google/target.css?pages/test.tsx;Fira_Code;{"fallback":["system-ui"],"variant":"400"}';
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"display":"swap","variant":"900"}';
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?{"arguments":[{"display":"swap","variant":"900"}],"import":"Inter","path":"pages/test.tsx"}';
import React from 'react';
4 changes: 2 additions & 2 deletions packages/next-swc/crates/core/tests/fixture/next-font-loaders/multiple-imports/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
import inter from '@next/font/google/target.css?pages/test.tsx;Inter;{"variant":"900"}';
import fira from '@next/font/google/target.css?pages/test.tsx;Fira_Code;{"display":"swap","variant":"400"}';
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?{"arguments":[{"display":"swap","variant":"400"}],"import":"Fira_Code","path":"pages/test.tsx"}';
import React from 'react';
2 changes: 1 addition & 1 deletion packages/next-swc/crates/core/tests/fixture/next-font-loaders/no-args/output.js
View file
Open in desktop
@@ -1 +1 @@
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"}';
11 changes: 6 additions & 5 deletions packages/next/build/webpack/loaders/next-font-loader/index.ts
View file
Open in desktop
Expand Up @@ -32,11 +32,12 @@ export default async function nextFontLoader(this: any) {
return outputPath
}

// next-swc next_font_loaders turns each function call argument into JSON seperated by semicolons
let [relativeFilePathFromRoot, functionName, ...data] = this.resourceQuery
.slice(1)
.split(';')
data = data.map((value: string) => JSON.parse(value))
// next-swc next_font_loaders turns each font loader call into JSON
const {
path: relativeFilePathFromRoot,
import: functionName,
arguments: data,
} = JSON.parse(this.resourceQuery.slice(1))

try {
const fontLoader: FontLoader = require(path.join(
Expand Down