add eslint-plugin-solid

vikejs · Oct 19, 2024 · 044574c · 044574c
1 parent 82d021f
commit 044574c
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 17 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -1,6 +1,11 @@
 import tseslint from 'typescript-eslint'
+import solid from 'eslint-plugin-solid/configs/typescript'
 
 export default tseslint.config(
+  {
+    files: ['**/*.{js,ts,jsx,tsx}'],
+    ...solid
+  },
   {
     ignores: ['**/dist/']
   },

diff --git a/examples/full/pages/images/+Page.tsx b/examples/full/pages/images/+Page.tsx
@@ -25,22 +25,23 @@ function Page() {
   );
 }
 
-function Image({ src, author }: { src: string; author: string }) {
+function Image(props: { src: string; author: string }) {
   return (
     <>
-      <img src={src} height={48} style={{ "vertical-align": "middle", "margin-left": "10px" }} />
+      <img src={props.src} height={48} style={{ "vertical-align": "middle", "margin-left": "10px" }} />
       <Head>
         <script
           type="application/ld+json"
+          // eslint-disable-next-line solid/no-innerhtml
           innerHTML={JSON.stringify({
             "@context": "https://schema.org/",
-            contentUrl: { src },
+            contentUrl: { src: props.src },
             creator: {
               "@type": "Person",
-              name: author,
+              name: props.author,
             },
           })}
-        ></script>
+        />
       </Head>
     </>
   );

diff --git a/examples/full/pages/index/+Page.tsx b/examples/full/pages/index/+Page.tsx
@@ -15,7 +15,7 @@ const ClientOnlyCounterSlow = clientOnly(async () => {
 function Page() {
   return (
     <>
-      <Config image={image}></Config>
+      <Config image={image} />
       <h1>My Vike + Solid App</h1>
       This page is:
       <ul>

diff --git a/examples/full/pages/starship/+Layout.tsx b/examples/full/pages/starship/+Layout.tsx
@@ -43,7 +43,7 @@ function Layout(props: FlowProps) {
 }
 
 function Link(props: any) {
-  return <a style={{ marginRight: 10, ...props.style }} {...props} />;
+  return <a style={{ 'margin-right': '10', ...props.style }} {...props} />;
 }
 
 function Counter() {

diff --git a/examples/minimal/pages/Layout.jsx b/examples/minimal/pages/Layout.jsx
@@ -1,6 +1,6 @@
 import "./Layout.css";
 
-export function Layout({ children }) {
+export function Layout(props) {
   return (
     <PageLayout>
       <Sidebar>
@@ -11,12 +11,12 @@ export function Layout({ children }) {
           About
         </a>
       </Sidebar>
-      <Content>{children}</Content>
+      <Content>{props.children}</Content>
     </PageLayout>
   );
 }
 
-function PageLayout({ children }) {
+function PageLayout(props) {
   return (
     <div
       style={{
@@ -25,12 +25,12 @@ function PageLayout({ children }) {
         margin: "auto",
       }}
     >
-      {children}
+      {props.children}
     </div>
   );
 }
 
-function Sidebar({ children }) {
+function Sidebar(props) {
   return (
     <div
       style={{
@@ -43,12 +43,12 @@ function Sidebar({ children }) {
         "line-height": "1.8em",
       }}
     >
-      {children}
+      {props.children}
     </div>
   );
 }
 
-function Content({ children }) {
+function Content(props) {
   return (
     <div
       style={{
@@ -58,7 +58,7 @@ function Content({ children }) {
         "min-height": "100vh",
       }}
     >
-      {children}
+      {props.children}
     </div>
   );
 }
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "@brillout/test-e2e": "^0.5.35",
     "@brillout/test-types": "^0.1.15",
     "eslint": "^9.13.0",
+    "eslint-plugin-solid": "^0.14.3",
     "playwright": "^1.48.0",
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.10.0"

diff --git a/packages/vike-solid/helpers/clientOnly.tsx b/packages/vike-solid/helpers/clientOnly.tsx
@@ -17,7 +17,7 @@ import { isServer } from "solid-js/web";
  * @see {@link https://vike.dev/clientOnly}
  */
 export function clientOnly<T extends Component<any>>(fn: () => Promise<{ default: T } | T>) {
-  if (isServer) return (props: ComponentProps<T> & { fallback?: JSX.Element }) => props.fallback;
+  if (isServer) return (props: ComponentProps<T> & { fallback?: JSX.Element }) => <>{props.fallback}</>;
 
   const [comp, setComp] = createSignal<T>();
   fn().then((m) => setComp(() => ("default" in m ? m.default : m)));

diff --git a/packages/vike-solid/integration/getPageElement.tsx b/packages/vike-solid/integration/getPageElement.tsx
@@ -46,7 +46,7 @@ function Wrapper(props: { children: JSX.Element }) {
     });
   };
 
-  return renderWrappers();
+  return <>{renderWrappers()}</>;
 }
 
 function Page() {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ function Wrapper(props: { children: JSX.Element }) { @@
         });
       };
-      return renderWrappers();
+      return <>{renderWrappers()}</>;
     }
     function Page() {
@@ Expand Down @@