Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/components/FileExplorer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import htmlIconUrl from '~/images/file-icons/html.svg?url'
import jsonIconUrl from '~/images/file-icons/json.svg?url'
import svelteIconUrl from '~/images/file-icons/svelte.svg?url'
import vueIconUrl from '~/images/file-icons/vue.svg?url'
import markoIconUrl from '~/images/file-icons/marko.svg?url'
import textIconUrl from '~/images/file-icons/txt.svg?url'
import type { GitHubFileNode } from '~/utils/documents.server'
import { twMerge } from 'tailwind-merge'
Expand All @@ -30,6 +31,8 @@ const getFileIconPath = (filename: string) => {
return svelteIconUrl
case 'vue':
return vueIconUrl
case 'marko':
return markoIconUrl
default:
return textIconUrl
}
Expand Down
4 changes: 4 additions & 0 deletions src/components/markdown/codeBlock.shared.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ export function getCodeBlockLanguageFromFilePath(filePath: string) {
if (['prettierrc', 'babelrc', 'webmanifest'].includes(ext)) return 'json'
if (['env', 'example'].includes(ext)) return 'sh'

// Marko is HTML-based; @tanstack/highlight has no Marko grammar, so fall
// back to html for reasonable tag/attribute/string coloring.
if (ext === 'marko') return 'html'

if (
[
'gitignore',
Expand Down
54 changes: 54 additions & 0 deletions src/images/file-icons/marko.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions src/images/marko-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/libraries/frameworks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import alpineLogo from '../images/alpine-logo.svg'
import angularLogo from '../images/angular-logo.svg'
import jsLogo from '../images/js-logo.svg'
import litLogo from '../images/lit-logo.svg'
import markoLogo from '../images/marko-logo.svg'
import qwikLogo from '../images/qwik-logo.svg'
import preactLogo from '../images/preact-logo.svg'
import reactLogo from '../images/react-logo.svg'
Expand Down Expand Up @@ -53,6 +54,13 @@ export const frameworkOptions = [
color: 'bg-orange-600',
fontColor: 'text-orange-600',
},
{
label: 'Marko',
value: 'marko',
logo: markoLogo,
color: 'bg-cyan-500',
fontColor: 'text-cyan-500',
},
{
label: 'Qwik',
value: 'qwik',
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/libraries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ export const virtual: LibrarySlim = {
to: '/virtual',
tagline: 'Headless UI for Virtualizing Large Element Lists',
description:
'Virtualize only the visible content for massive scrollable DOM nodes at 60FPS in TS/JS, React, Vue, Solid, Svelte, Lit & Angular while retaining 100% control over markup and styles.',
'Virtualize only the visible content for massive scrollable DOM nodes at 60FPS in TS/JS, React, Vue, Solid, Svelte, Lit, Angular & Marko while retaining 100% control over markup and styles.',
bgStyle: 'bg-purple-500',
borderStyle: 'border-purple-500/50',
textStyle: 'text-purple-500',
Expand All @@ -438,7 +438,7 @@ export const virtual: LibrarySlim = {
bgRadial: 'from-purple-500 via-violet-600/50 to-transparent',
badge: undefined,
repo: 'tanstack/virtual',
frameworks: ['react', 'solid', 'vue', 'svelte', 'lit', 'angular'],
frameworks: ['react', 'solid', 'vue', 'svelte', 'lit', 'angular', 'marko'],
corePackageName: '@tanstack/virtual-core',
npmPackageNames: ['@tanstack/virtual-core', 'react-virtual'],
latestVersion: 'v3',
Expand Down
1 change: 1 addition & 0 deletions src/libraries/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export type Framework =
| 'angular'
| 'alpine'
| 'lit'
| 'marko'
| 'preact'
| 'qwik'
| 'react'
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/virtual.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const textStyles = 'text-violet-700 dark:text-violet-400'

export const virtualProject = {
...virtual,
description: `Virtualize only the visible content for massive scrollable DOM nodes at 60FPS in TS/JS, React, Vue, Solid, Svelte, Lit & Angular while retaining 100% control over markup and styles.`,
description: `Virtualize only the visible content for massive scrollable DOM nodes at 60FPS in TS/JS, React, Vue, Solid, Svelte, Lit, Angular & Marko while retaining 100% control over markup and styles.`,
latestBranch: 'main',
bgRadial: 'from-purple-500 via-violet-600/50 to-transparent',
textColor: 'text-purple-600',
Expand Down
1 change: 1 addition & 0 deletions src/utils/llms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const frameworkLabels: Record<Framework, string> = {
angular: 'Angular',
alpine: 'Alpine',
lit: 'Lit',
marko: 'Marko',
preact: 'Preact',
qwik: 'Qwik',
react: 'React',
Expand Down
1 change: 1 addition & 0 deletions src/utils/npm-packages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const frameworkMeta: Record<Framework, { name: string; color: string }> =
solid: { name: 'Solid', color: '#2C4F7C' },
vue: { name: 'Vue', color: '#42B883' },
svelte: { name: 'Svelte', color: '#FF3E00' },
marko: { name: 'Marko', color: '#44bfef' },
angular: { name: 'Angular', color: '#DD0031' },
alpine: { name: 'Alpine', color: '#77C1D2' },
lit: { name: 'Lit', color: '#325CFF' },
Expand Down
2 changes: 1 addition & 1 deletion src/utils/repo-path.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const MAX_REPO_PATH_LENGTH = 512

const REPO_PATH_SEGMENT_PATTERN = /^[a-zA-Z0-9._$-]+$/
const REPO_PATH_SEGMENT_PATTERN = /^[a-zA-Z0-9._$+-]+$/

export function isValidRepoPath(path: string) {
if (path === '') {
Expand Down
Loading