Skip to content

Ssr fix#40

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

Open
numito wants to merge 3 commits into
base:master
Choose a base branch
from
Open

Ssr fix #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69a93a3
Modify regex to match h1-h6 tags
gg-phntms Apr 2, 2024
eea8bd0
SSR fix
numito Sep 19, 2024
8c7f9e7
missing quotation marks
numito Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cli/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ export const extractStyles = (path: string) => {
: fs.readFileSync(path).toString();

return fileContent.match(
/([a-zA-Z_]*)(?:[.]{1})([a-zA-Z_]+[\w\-_]*)(?:[\s\.\,\{\>#\:]{0})/gim
/(h[1-6]|[a-zA-Z_]*)(?:[.]{1})([a-zA-Z_]+[\w\-_]*)(?:[\s\.\,\{\>#\:]{0})/gim
);
};

Expand Down
8 changes: 6 additions & 2 deletions src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,11 @@ import {
PolymorphicComponent,
variantsType,
} from "./type";
import { findMatchingCompoundVariants, flattenCss } from "./utils";
import {
componentDisplayName,
findMatchingCompoundVariants,
flattenCss,
} from "./utils";

export { CSSComponentConfig, CSS, VariantProps } from "./type";

Expand DownExpand Up@@ -70,7 +74,7 @@ export const styled = <
}

componentProps.className = componentStyles.join(" ");
styledComponent.displayName = element.toString();
styledComponent.displayName = componentDisplayName(element);
return createElement(element, componentProps);
}
);
Expand Down
3 changes: 3 additions & 0 deletions src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,3 +16,6 @@ export const findMatchingCompoundVariants = (

export const flattenCss = (css: CSS) =>
Array.isArray(css) ? css.join(" ") : css;

export const componentDisplayName = (component: any) =>
typeof window == "undefined" ? component.displayName : component.toString();