Merge branch 'main' of https://github.com/solidjs/solid-site

# Conflicts:
#	src/App.tsx

Author: davedbase

package.json

@@ -56,7 +56,7 @@
     "solid-utils": "^0.8.1"
   },
   "devDependencies": {
-    "@aminya/minijson": "^0.6.2",
+    "@aminya/minijson": "^1.1.0",
     "@mdx-js/rollup": "^3.0.1",
     "@tailwindcss/typography": "^0.5.10",
     "@types/markdown-it": "^13.0.7",

pnpm-lock.yaml

@@ -10,10 +10,10 @@ export const App = () => {
   preventSmoothScrollOnTabbing();
 
   return (
-    <main class="min-h-screen">
-      <Router
-        root={(props) => (
-          <MetaProvider>
+    <MetaProvider>
+      <main class="min-h-screen">
+        <Router
+          root={(props) => (
             <AppContextProvider>
               <Header />
               {/* two div wrappers to make page animation work and performant */}
@@ -25,11 +25,11 @@ export const App = () => {
                 </div>
               </div>
             </AppContextProvider>
-          </MetaProvider>
-        )}
-      >
-        {routes}
-      </Router>
-    </main>
+          )}
+        >
+          {routes}
+        </Router>
+      </main>
+    </MetaProvider>
   );
 };

src/App.tsx

@@ -45,9 +45,8 @@ export type Locale =
 for validating of other dictionaries have same keys as en dictionary
 some might be missing, but the shape should be the same
 */
-type DeepPartial<T> = T extends Record<string, unknown>
-  ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : T;
+type DeepPartial<T> =
+  T extends Record<string, unknown> ? { [K in keyof T]?: DeepPartial<T[K]> } : T;
 
 const raw_dict_map: Record<Locale, () => Promise<{ dict: DeepPartial<RawDictionary> }>> = {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-explicit-any
@@ -96,8 +95,8 @@ const toLocale = (string: string): Locale | undefined =>
   string in raw_dict_map
     ? (string as Locale)
     : string in LANG_ALIASES
-    ? (LANG_ALIASES[string] as Locale)
-    : undefined;
+      ? (LANG_ALIASES[string] as Locale)
+      : undefined;
 
 interface Settings {
   locale: Locale;

src/AppContext.tsx

@@ -1,10 +1,10 @@
-import { render } from "solid-js/web";
+import { render } from 'solid-js/web';
 import './assets/main.css';
 
 // import { registerSW } from 'virtual:pwa-register';
 import { App } from './App';
 
-render(() => <App />, document.getElementById("app")); 
+render(() => <App />, document.getElementById('app')!);
 
 // Register service worker
 // registerSW({ onOfflineReady() {} });

src/main.tsx

@@ -8,7 +8,7 @@ export type MDXComponent = Component<{
     Twitch?: Component<TwitchProps>;
     YouTube?: Component<YouTubeProps>;
     Spotify?: Component<SpotifyProps>;
-    Notice?: Component<any>
+    Notice?: Component<any>;
   };
 }>;
 

src/pages/Blog.data.ts

@@ -5,8 +5,7 @@ import { Title } from '@solidjs/meta';
 import { useRouteReadyState } from '../utils/routeReadyState';
 import type { BlogData } from './Blog.data';
 
-const Blog: Component<{data:BlogData}> = (props) => {
-
+const Blog: Component<{ data: BlogData }> = (props) => {
   const data = props.data;
 
   useRouteReadyState();

src/pages/Blog.tsx

@@ -63,7 +63,7 @@ const Contributor: Component<ContributorProps> = (props) => {
   );
 };
 
-const Contributors: Component<{data:ContributorsDataProps}> = (props) => {
+const Contributors: Component<{ data: ContributorsDataProps }> = (props) => {
   const { t } = useAppState();
   const data = props.data;
 

src/pages/Contributors.tsx

@@ -120,7 +120,7 @@ const Content: Component<{
   </Switch>
 );
 
-const Docs: Component<{ hash?: string, data: DocData }> = (props) => {
+const Docs: Component<{ hash?: string; data: DocData }> = (props) => {
   const data = props.data;
   const [current, setCurrent] = createSignal<string | null>(null);
   const [toggleSections, setToggleSections] = createSignal(false);
@@ -169,7 +169,7 @@ const Docs: Component<{ hash?: string, data: DocData }> = (props) => {
         aside={<Sidebar items={sections()} current={current} hash={props.hash} />}
         content={<Content data={data} />}
       />
-  </>
+    </>
   );
 };
 

src/pages/Docs.tsx

@@ -10,7 +10,7 @@ import type { Tab } from 'solid-repl';
 import { entries } from '@solid-primitives/utils';
 import { Title } from '@solidjs/meta';
 
-const Examples: Component<{data: ExamplesDataRoute}> = (props) => {
+const Examples: Component<{ data: ExamplesDataRoute }> = (props) => {
   const data = props.data;
   const context = useAppState();
   const { t } = context;