Merge branch 'main' into deploy-stage

Author: davedbase

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",

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"

src/components/layout/SideContent.tsx

@@ -55,7 +55,7 @@ const SideContent: Component<{
         <div class="w-full lg:w-9/12 p-5 md:p-10 bg-white dark:bg-solid-darkbg">
           <a
             href="https://docs.solidjs.com"
-            class="sticky top-16 p-3 w-full block text-transparent hover:text-white text-center rounded-md bg-amber-400 hover:bg-gray-400 transition duration-300"
+            class="sticky top-16 p-3 w-full block hover:text-white text-center rounded-md bg-amber-400 hover:bg-gray-400 transition duration-300"
           >
             <b>New Beta Docs!</b>&nbsp;Click here to access new beta documentation at{' '}
             <u>docs.solidjs.com</u>.

src/pages/Articles/solid-start-the-shape-frameworks-to-come.mdx

@@ -116,3 +116,5 @@ This is a framework designed for builders and people who have their own opinions
 And for that, we (the Solid Core Team) are incredibly thankful. Thankful for all the contributors submitting issues and PRs. Thankful for open-source projects that make this technically possible like Vite, Vinxi, and Nitro. Thankful for all the sponsors contributing funding like Netlify, Google Chrome, and JetBrains. Most importantly we're thankful to all of you for embracing development in the open, choosing better over convenient, and sticking with us on this journey. You inspire us to keep building the best solutions we can and to continue to shape the future of web development.
 
 <YouTube youTubeId="ZVjXtfdKQ3g" />
+
+Thanks to Theo Browne, Erik Demaine, Dev Agrawal, and bigmistqke for reviewing this article, and Dev Agrawal for providing the Single Flight Mutation image.

src/pages/Examples.tsx

@@ -61,7 +61,7 @@ const Examples: Component<{data: ExamplesDataRoute}> = (props) => {
 
   return (
     <div class="flex flex-col relative">
-      <Title>Exanples | SolidJS</Title>
+      <Title>Examples | SolidJS</Title>
       <div class="container my-10 w-[98vw] mx-auto">
         <div class="md:grid md:grid-cols-12 gap-6">
           <div class="md:col-span-4 lg:col-span-3 overflow-auto border dark:border-solid-darkLighterBg p-5 rounded md:h-[82vh]">