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;

src/pages/Examples.tsx

@@ -35,7 +35,7 @@ const strength_icons: { [key: string]: string } = {
   productive,
 };
 
-const Home: Component<{data: { benchmarks: GraphData[] }}> = (props) => {
+const Home: Component<{ data: { benchmarks: GraphData[] } }> = (props) => {
   const isRouting = useIsRouting();
   const data = props.data;
   const ctx = useAppState();

src/pages/Home.tsx

@@ -140,7 +140,7 @@ const ResourceLink: Component<Resource> = (props) => {
   );
 };
 
-const Packages: Component<{data: PackagesDataProps}> = (props) => {
+const Packages: Component<{ data: PackagesDataProps }> = (props) => {
   const { t } = useAppState();
   const data = props.data;
   const fs = new Fuse(data.list, {

src/pages/Packages.tsx

@@ -91,7 +91,7 @@ const AResource: Component<Resource> = (props) => {
   );
 };
 
-const Resources: Component<{data: ResourcesDataProps}> = (props) => {
+const Resources: Component<{ data: ResourcesDataProps }> = (props) => {
   const { t } = useAppState();
   const data = props.data;
   const fs = new Fuse(data.list, {

src/pages/Resources.tsx

@@ -1378,7 +1378,8 @@ const articles: Array<Resource> = [
   {
     link: 'https://www.brenelz.com/posts/optimistic-ui-with-solid-start/',
     title: 'Optimistic UI With SolidStart',
-    description: 'Optimistic ui essentially means showing the happy path state quickly without needing a network request to finish.',
+    description:
+      'Optimistic ui essentially means showing the happy path state quickly without needing a network request to finish.',
     author: 'Brenley Dueck',
     author_url: 'https://brenelz.com',
     keywords: ['solid', 'solidstart', 'optimistic'],
@@ -1413,12 +1414,23 @@ const articles: Array<Resource> = [
     title: 'Solid Myths Debunked',
     description: 'Today we will talk about some of the myths about Solid that people believe.',
     author: 'Brenley Dueck',
-    author_url: 'https://brenelz.com',
+    author_url: 'https://brenelz.com/',
     keywords: ['solid', 'solidstart', 'myths', 'signals'],
     type: ResourceType.Article,
     categories: [ResourceCategory.Educational],
     published_at: 1714194000000,
   },
+  {
+    link: 'https://thenewstack.io/how-js-meta-framework-solidstart-became-router-agnostic/',
+    title: 'How JS Meta-Framework SolidStart Became Router Agnostic',
+    description: 'SolidStart is a new meta-framework from the SolidJS team that doesn\'t dictate which router developers use. Ryan Carniato explains why.',
+    author: 'Loraine Lawson',
+    author_url: 'https://thenewstack.io/',
+    keywords: ['solid', 'solidstart', 'router', 'vinxi', 'tanstack'],
+    type: ResourceType.Article,
+    categories: [ResourceCategory.Educational],
+    published_at: 1721102023000,
+  },
 ];
 
 export default articles;

src/pages/Resources/Articles.data.ts

@@ -13,6 +13,7 @@ export enum ResourceCategory {
   Primitives = 'primitive',
   Routers = 'router',
   Data = 'data',
+  DataVisualization = 'data_visualization',
   UI = 'ui',
   Plugins = 'plugin',
   Starters = 'starters',

src/pages/Resources/Ecosystem.ts

@@ -1727,7 +1727,7 @@ const utilities: Array<Resource> = [
     keywords: ['charts', 'apex', 'ui'],
     official: false,
     type: PackageType.Package,
-    categories: [ResourceCategory.AddOn, ResourceCategory.UI],
+    categories: [ResourceCategory.AddOn, ResourceCategory.DataVisualization, ResourceCategory.UI],
   },
   {
     link: 'https://www.locatorjs.com/install/solidjs',
@@ -1801,7 +1801,7 @@ const utilities: Array<Resource> = [
   {
     link: 'https://github.com/pureliani/solid-query',
     title: '@gapu/solid-query',
-    description: 'Primitives for managing Rest Api integrations in Solid.js',
+    description: 'Primitives for managing queries and cache in solid.js',
     author: 'Gabriel Pureliani',
     author_url: 'https://github.com/pureliani',
     keywords: ['api', 'query', 'solid-query'],
@@ -1841,7 +1841,7 @@ const utilities: Array<Resource> = [
     keywords: ['grid', 'ag grid', 'ag-grid'],
     official: false,
     type: PackageType.Package,
-    categories: [ResourceCategory.UI],
+    categories: [ResourceCategory.DataVisualization, ResourceCategory.UI],
   },
   {
     link: 'https://github.com/Supertigerr/solid-named-router',
@@ -1948,6 +1948,18 @@ const utilities: Array<Resource> = [
     keywords: ['form', 'field', 'validation', 'input', 'ui'],
     published_at: 1666197287705,
   },
+  {
+    title: '@gapu/formix',
+    link: 'https://github.com/pureliani/formix',
+    author: 'Gabriel Pureliani',
+    author_url: 'https://github.com/pureliani',
+    description:
+      '@gapu/formix is a powerful form management library for SolidJS. It provides a simple and flexible API for handling complex form state, validation, and submission.',
+    type: PackageType.Library,
+    categories: [ResourceCategory.UI, ResourceCategory.Primitives, ResourceCategory.Data],
+    official: false,
+    keywords: ['form', 'field', 'validation', 'input', 'ui'],
+  },
   {
     title: 'vite-plugin-solid-markdown',
     link: 'https://github.com/xbmlz/vite-plugin-solid-markdown',
@@ -2321,7 +2333,18 @@ const utilities: Array<Resource> = [
     keywords: ['charts', 'chartjs', 'ui'],
     official: false,
     type: PackageType.Package,
-    categories: [ResourceCategory.AddOn, ResourceCategory.UI],
+    categories: [ResourceCategory.AddOn, ResourceCategory.DataVisualization, ResourceCategory.UI],
+  },
+  {
+    link: 'https://github.com/thedanchez/uplot-solid',
+    title: 'uplot-solid',
+    description: 'Solid component wrapper around μPlot -- a small, fast and performant 2D canvas based chart for time series, lines, areas, ohlc & bars',
+    author: 'Daniel Sanchez',
+    author_url: 'https://github.com/thedanchez',
+    keywords: ['chart', 'plot', 'solid', 'ui', 'uplot'],
+    official: false,
+    type: PackageType.Package,
+    categories: [ResourceCategory.AddOn, ResourceCategory.DataVisualization, ResourceCategory.UI],
   },
   {
     title: '@rnwonder/solid-date-picker',
@@ -2451,7 +2474,7 @@ const utilities: Array<Resource> = [
     keywords: ['charts', 'echarts', 'data visualization', 'ui'],
     official: false,
     type: PackageType.Package,
-    categories: [ResourceCategory.AddOn, ResourceCategory.UI],
+    categories: [ResourceCategory.AddOn, ResourceCategory.DataVisualization, ResourceCategory.UI],
   },
   {
     title: 'solid-keep-alive',
@@ -2560,14 +2583,37 @@ const utilities: Array<Resource> = [
   {
     link: 'https://github.com/pdfslick/pdfslick',
     title: '@pdfslick/solid',
-    description: 'View and Interact with PDF documents in React, SolidJS, Svelte and JavaScript apps',
+    description:
+      'View and Interact with PDF documents in React, SolidJS, Svelte and JavaScript apps',
     author: 'PDFSlick',
     author_url: 'https://github.com/pdfslick/',
     keywords: ['pdf', 'viewer'],
     official: false,
     type: PackageType.Package,
     categories: [ResourceCategory.Starters, ResourceCategory.BuildUtilities],
   },
+  {
+    link: 'https://github.com/thednp/solid-color-picker',
+    title: '@thednp/solid-color-picker',
+    description: 'Modern Color Picker for SolidJS',
+    author: 'thednp',
+    author_url: 'https://github.com/thednp',
+    keywords: ['color', 'color-picker'],
+    official: false,
+    type: PackageType.Package,
+    categories: [ResourceCategory.Plugins, ResourceCategory.UI],
+  },
+  {
+    link: 'https://github.com/thednp/tinymce-solid',
+    title: 'tinymce-solid',
+    description: 'TinyMCE Component for SolidJS',
+    author: 'thednp',
+    author_url: 'https://github.com/thednp',
+    keywords: ['tinymce', 'editor', 'wysiwyg'],
+    official: false,
+    type: PackageType.Package,
+    categories: [ResourceCategory.UI],
+  },
 ];
 
 export default utilities;