Merge branch 'main' into dev

davedbase · davedbase · commit 7dae4c8cb407 · 2024-06-07T10:08:14.000-04:00
# Conflicts:
#	package.json
#	pnpm-lock.yaml
diff --git a/lang/ar/home.json b/lang/ar/home.json
@@ -33,7 +33,7 @@
       },
       {
         "label": "أكثر من 22 ألف",
-        "detail": "نجمة على الـ Github",
+        "detail": "نجمة على الـ GitHub",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/az/home.json b/lang/az/home.json
@@ -33,7 +33,7 @@
       },
       {
         "label": "24K",
-        "detail": "Github-da ulduz sayı",
+        "detail": "GitHub-da ulduz sayı",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/de/home.json b/lang/de/home.json
@@ -32,8 +32,8 @@
       "link": "https://bundlephobia.com/package/solid-js@1.2.1"
     },
     {
-      "label": "30k+",
-      "detail": "Github-Sterne",
+      "label": "32k+",
+      "detail": "GitHub-Sterne",
       "link": "https://star-history.t9t.io/#solidjs/solid"
     },
     {
diff --git a/lang/en/global.json b/lang/en/global.json
@@ -5,22 +5,14 @@
   "locale": "en-US",
   "nav": [
     {
-      "title": "Guides",
-      "path": "/guides"
+      "title": "Documentation",
+      "path": "https://docs.solidjs.com",
+      "external": true
     },
     {
       "title": "Tutorial",
       "path": "/tutorial"
     },
-    {
-      "title": "API",
-      "path": "/docs/latest/api"
-    },
-    {
-      "title": "SolidStart",
-      "path": "https://start.solidjs.com",
-      "external": true
-    },
     {
       "title": "Ecosystem",
       "path": "/ecosystem",
@@ -41,6 +33,11 @@
       "title": "Examples",
       "path": "/examples"
     },
+    {
+      "title": "SolidStart",
+      "path": "https://start.solidjs.com",
+      "external": true
+    },
     {
       "title": "Playground",
       "path": "https://playground.solidjs.com",
diff --git a/lang/en/home.json b/lang/en/home.json
@@ -36,8 +36,8 @@
         "link": "https://bundlephobia.com/package/solid-js@1.2.1"
       },
       {
-        "label": "30k+",
-        "detail": "Github stars",
+        "label": "32k+",
+        "detail": "GitHub stars",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/he/home.json b/lang/he/home.json
@@ -29,8 +29,8 @@
         "link": "https://bundlephobia.com/package/solid-js@1.2.1"
       },
       {
-        "label": "30k+",
-        "detail": "כוכבים ב-Github",
+        "label": "32k+",
+        "detail": "כוכבים ב-GitHub",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/id/home.json b/lang/id/home.json
@@ -32,8 +32,8 @@
         "link": "https://bundlephobia.com/package/solid-js@1.2.1"
       },
       {
-        "label": "30k+",
-        "detail": "Github stars",
+        "label": "32k+",
+        "detail": "GitHub stars",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/it/home.json b/lang/it/home.json
@@ -37,8 +37,8 @@
       "link": "https://bundlephobia.com/package/solid-js@1.2.1"
     },
     {
-      "label": "30k+",
-      "detail": "Stelle Github",
+      "label": "32k+",
+      "detail": "Stelle GitHub",
       "link": "https://star-history.t9t.io/#solidjs/solid"
     },
     {
diff --git a/lang/ja/home.json b/lang/ja/home.json
@@ -29,8 +29,8 @@
         "link": "https://bundlephobia.com/package/solid-js@1.2.1"
       },
       {
-        "label": "30k+",
-        "detail": "Github stars",
+        "label": "32k+",
+        "detail": "GitHub stars",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/pl/home.json b/lang/pl/home.json
@@ -37,7 +37,7 @@
     },
     {
       "label": "27+ tys.",
-      "detail": "Gwiazdek na Githubie",
+      "detail": "Gwiazdek na GitHubie",
       "link": "https://star-history.t9t.io/#solidjs/solid"
     },
     {
diff --git a/lang/pt/home.json b/lang/pt/home.json
@@ -32,8 +32,8 @@
         "link": "https://bundlephobia.com/package/solid-js@1.2.1"
       },
       {
-        "label": "30k+",
-        "detail": "Estrelas no Github",
+        "label": "32k+",
+        "detail": "Estrelas no GitHub",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/ru/home.json b/lang/ru/home.json
@@ -37,8 +37,8 @@
       "link": "https://bundlephobia.com/package/solid-js@1.2.1"
     },
     {
-      "label": "30k+",
-      "detail": "Звезд на Github",
+      "label": "32k+",
+      "detail": "Звезд на GitHub",
       "link": "https://star-history.t9t.io/#solidjs/solid"
     },
     {
diff --git a/lang/tl/home.json b/lang/tl/home.json
@@ -29,8 +29,8 @@
         "link": "https://bundlephobia.com/package/solid-js@1.2.1"
       },
       {
-        "label": "30k+",
-        "detail": "Github stars",
+        "label": "32k+",
+        "detail": "GitHub stars",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/tr/home.json b/lang/tr/home.json
@@ -29,8 +29,8 @@
         "link": "https://bundlephobia.com/package/solid-js@1.2.1"
       },
       {
-        "label": "30k+",
-        "detail": "Github Yıldızı",
+        "label": "32k+",
+        "detail": "GitHub Yıldızı",
         "link": "https://star-history.t9t.io/#solidjs/solid"
       },
       {
diff --git a/lang/zh-cn/home.json b/lang/zh-cn/home.json
@@ -32,8 +32,8 @@
       "link": "https://bundlephobia.com/package/solid-js@1.2.1"
     },
     {
-      "label": "30k+",
-      "detail": "Github stars",
+      "label": "32k+",
+      "detail": "GitHub stars",
       "link": "https://star-history.t9t.io/#solidjs/solid"
     },
     {
diff --git a/lang/zh-tw/home.json b/lang/zh-tw/home.json
@@ -36,8 +36,8 @@
       "link": "https://bundlephobia.com/package/solid-js@1.2.1"
     },
     {
-      "label": "30k+",
-      "detail": "Github stars",
+      "label": "32k+",
+      "detail": "GitHub stars",
       "link": "https://star-history.t9t.io/#solidjs/solid"
     },
     {
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "engines": {
     "node": ">=16.0.0",
-    "pnpm": ">=8.7.0"
+    "pnpm": ">=9.1.4"
   },
   "type": "module",
   "scripts": {
@@ -49,10 +49,11 @@
     "solid-dismiss": "^1.7.122",
     "solid-heroicons": "<3.0.0",
     "solid-js": "1.8.16",
-    "@solidjs/meta": "^0.29.3",
+    "solid-meta": "^0.28.1",
     "solid-repl": "^0.25.0",
     "solid-social": "^0.9.6",
-    "solid-transition-group": "^0.2.3"
+    "solid-transition-group": "^0.2.3",
+    "solid-utils": "^0.8.1"
   },
   "devDependencies": {
     "@aminya/minijson": "^0.6.2",
@@ -89,7 +90,7 @@
     "solid-js": "1.8.16",
     "@rollup/pluginutils": "5.1.0"
   },
-  "packageManager": "pnpm@9.0.6",
+  "packageManager": "pnpm@9.1.4",
   "pnpm": {
     "patchedDependencies": {
       "monaco-editor@0.47.0": "patches/monaco-editor@0.47.0.patch"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/layout/SideContent.tsx b/src/components/layout/SideContent.tsx
diff --git a/src/pages/Articles/state-of-solid-july-2022.mdx b/src/pages/Articles/state-of-solid-july-2022.mdx
diff --git a/src/pages/Articles/state-of-solid-march-2022.mdx b/src/pages/Articles/state-of-solid-march-2022.mdx
diff --git a/src/pages/Contributors.tsx b/src/pages/Contributors.tsx
diff --git a/src/pages/Resources/Articles.data.ts b/src/pages/Resources/Articles.data.ts
diff --git a/src/pages/Resources/Utilities.data.ts b/src/pages/Resources/Utilities.data.ts
diff --git a/src/pages/Resources/Videos.data.ts b/src/pages/Resources/Videos.data.ts

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`},`
`34`	`34`	`{`
`35`	`35`	`"label": "أكثر من 22 ألف",`
`36`		`- "detail": "نجمة على الـ Github",`
	`36`	`+ "detail": "نجمة على الـ GitHub",`
`37`	`37`	`"link": "https://star-history.t9t.io/#solidjs/solid"`
`38`	`38`	`},`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@`
`32`	`32`	`"link": "https://bundlephobia.com/package/solid-js@1.2.1"`
`33`	`33`	`},`
`34`	`34`	`{`
`35`		`- "label": "30k+",`
`36`		`- "detail": "Github-Sterne",`
	`35`	`+ "label": "32k+",`
	`36`	`+ "detail": "GitHub-Sterne",`
`37`	`37`	`"link": "https://star-history.t9t.io/#solidjs/solid"`
`38`	`38`	`},`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`	`"link": "https://bundlephobia.com/package/solid-js@1.2.1"`
`37`	`37`	`},`
`38`	`38`	`{`
`39`		`- "label": "30k+",`
`40`		`- "detail": "Github stars",`
	`39`	`+ "label": "32k+",`
	`40`	`+ "detail": "GitHub stars",`
`41`	`41`	`"link": "https://star-history.t9t.io/#solidjs/solid"`
`42`	`42`	`},`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@`
`29`	`29`	`"link": "https://bundlephobia.com/package/solid-js@1.2.1"`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- "label": "30k+",`
`33`		`- "detail": "כוכבים ב-Github",`
	`32`	`+ "label": "32k+",`
	`33`	`+ "detail": "כוכבים ב-GitHub",`
`34`	`34`	`"link": "https://star-history.t9t.io/#solidjs/solid"`
`35`	`35`	`},`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@`
`37`	`37`	`"link": "https://bundlephobia.com/package/solid-js@1.2.1"`
`38`	`38`	`},`
`39`	`39`	`{`
`40`		`- "label": "30k+",`
`41`		`- "detail": "Stelle Github",`
	`40`	`+ "label": "32k+",`
	`41`	`+ "detail": "Stelle GitHub",`
`42`	`42`	`"link": "https://star-history.t9t.io/#solidjs/solid"`
`43`	`43`	`},`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`},`
`38`	`38`	`{`
`39`	`39`	`"label": "27+ tys.",`
`40`		`- "detail": "Gwiazdek na Githubie",`
	`40`	`+ "detail": "Gwiazdek na GitHubie",`
`41`	`41`	`"link": "https://star-history.t9t.io/#solidjs/solid"`
`42`	`42`	`},`
`43`	`43`	`{`