Merge branch 'main' into deps-format-lint

Author: LadyBluenotes

app.config.ts

@@ -71,6 +71,12 @@ export default defineConfig(
 				expressiveCode: {
 					themes: ["github-light-default", "material-theme-ocean"],
 					themeCssSelector: (theme) => `[data-theme="${theme.type}"]`,
+					frames: false,
+					styleOverrides: {
+						twoSlash: {
+							cursorColor: "var(--twoslash-cursor)",
+						},
+					},
 				},
 				toc: {
 					minDepth: 2,

src/routes/solid-start/advanced/request-events.mdx

@@ -10,7 +10,7 @@ SolidStart uses `event.locals` to pass around a local context where needed.
 
 When adding fields to `event.locals`, the fields can be typed:
 
-```tsx filename="global.d.ts'
+```tsx title="global.d.ts"
 /// <reference types="@solidjs/start/env" />
 declare module App {
 	interface RequestEventLocals {

src/routes/solid-start/building-your-application/routing.mdx

@@ -35,7 +35,7 @@ The `<Router />` component expects a `root` prop which functions as the root lay
 
 `<FileRoutes />` will generate a route for each file in the `routes` directory and its subdirectories. For a route to be rendered as a page, it must default export a component. This component represents the content that will be rendered when users visit the page:
 
-```tsx filename="routes/index.tsx"
+```tsx title="routes/index.tsx"
 export default function Index() {
 	return <div>Welcome to my site!</div>;
 }
@@ -79,7 +79,7 @@ In this case, the `blog.tsx` file will act as a layout for the articles in the `
 
 <TabsCodeBlocks>
   <div id="ts">
-```tsx filename="routes/blog.tsx" title="blog.tsx"
+```tsx title="routes/blog.tsx"
 import { RouteSectionProps } from "@solidjs/router";
 
 export default function BlogLayout(props: RouteSectionProps) {
@@ -88,7 +88,7 @@ export default function BlogLayout(props: RouteSectionProps) {
 ```
    </div>
    <div id="js">
- ```jsx filename="routes/blog.jsx" title="blog.tsx"
+ ```jsx title="routes/blog.jsx"
 export default function BlogLayout(props) {
 	return <div>{props.children}</div>;
 }

src/styles.css

@@ -18,7 +18,6 @@
 
 	html,
 	.custom-scrollbar {
-		scroll-behavior: smooth;
 		scroll-padding-top: 6rem;
 
 		scrollbar-color: #778292 #e7ecf2;
@@ -126,5 +125,15 @@
 
 /* pace from solidbase */
 :root {
-	--bprogress-color: theme("colors.blue.500") !important;
+	--bprogress-color: theme('colors.blue.500') !important;
 }
+
+/* twoslash from solidbase */
+html {
+	--twoslash-cursor: #24292E;
+}
+
+html[data-theme="dark"] {
+	--twoslash-cursor: #BABED8;
+}
+

src/ui/page-issue-link.tsx

@@ -1,4 +1,4 @@
-import { Component, createMemo } from "solid-js";
+import { Component, createMemo, createSignal, onMount } from "solid-js";
 import { Icon } from "solid-heroicons";
 import { exclamationTriangle } from "solid-heroicons/outline";
 import { useI18n } from "~/i18n/i18n-context";
@@ -9,6 +9,10 @@ export const PageIssueLink: Component = () => {
 	const location = useLocation();
 	const i18n = useI18n();
 
+	const [mounted, setMounted] = createSignal(false);
+	
+	onMount(() => setMounted(true));
+
 	const srcPath = createMemo(() => {
 		return (
 			"https://github.com/solidjs/solid-docs-next/issues/new" +
@@ -18,7 +22,7 @@ export const PageIssueLink: Component = () => {
 			"&template=CONTENT.yml" +
 			"&title=[Content]:" +
 			`&subject=${getEntryFileName()}` +
-			`&page=${`https://docs.solidjs.com${location.pathname}`}`
+			`&page=${mounted() ? window.location.href : ""}`
 		);
 	});