Skip to content
Draft
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
5 changes: 2 additions & 3 deletions app/composables/useMarkdown.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { regExpEscape } from '@li/regexp-escape-polyfill'
import { decodeHtmlEntities } from '~/utils/formatters'

interface UseMarkdownOptions {
Expand Down Expand Up @@ -45,10 +46,8 @@ function stripAndEscapeHtml(text: string, packageName?: string): string {
stripped = stripped.trim()
// Collapse multiple whitespace into single space
stripped = stripped.replace(/\s+/g, ' ')
// Escape special regex characters in package name
const escapedName = packageName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
// Match package name at the start, optionally followed by: space, dash, colon, hyphen, or just space
const namePattern = new RegExp(`^${escapedName}\\s*[-:—]?\\s*`, 'i')
const namePattern = new RegExp(`^${regExpEscape(packageName)}\\s*[-:—]?\\s*`, 'i')
stripped = stripped.replace(namePattern, '').trim()
}

Expand Down
5 changes: 4 additions & 1 deletion app/composables/useStructuredFilters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
parseSortOption,
UPDATED_WITHIN_OPTIONS,
} from '#shared/types/preferences'
import { regExpEscape } from '@li/regexp-escape-polyfill'

/**
* Parsed search operators from text input
Expand Down Expand Up @@ -412,7 +413,9 @@ export function useStructuredFilters(options: UseStructuredFiltersOptions) {

function removeKeyword(keyword: string) {
filters.value.keywords = filters.value.keywords.filter(k => k !== keyword)
const newQ = searchQuery.value.replace(new RegExp(`keyword:${keyword}($| )`, 'g'), '').trim()
const newQ = searchQuery.value
.replace(new RegExp(`keyword:${regExpEscape(keyword)}($| )`, 'g'), '')
.trim()
router.replace({ query: { ...route.query, q: newQ || undefined } })
if (searchQueryModel) searchQueryModel.value = newQ
}
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"@iconify-json/svg-spinners": "1.2.4",
"@iconify-json/vscode-icons": "1.2.40",
"@intlify/shared": "11.2.8",
"@li/regexp-escape-polyfill": "jsr:0.3.4",
"@lunariajs/core": "https://pkg.pr.new/lunariajs/lunaria/@lunariajs/core@f07e1a3",
"@nuxt/a11y": "1.0.0-alpha.1",
"@nuxt/fonts": "0.13.0",
Expand Down
8 changes: 8 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions shared/utils/dev-dependency.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { regExpEscape } from '@li/regexp-escape-polyfill'

export type DevDependencySuggestionReason = 'known-package' | 'readme-hint'

export interface DevDependencySuggestion {
Expand Down Expand Up @@ -59,15 +61,11 @@ function isKnownDevDependencyPackage(packageName: string): boolean {
)
}

function escapeRegExp(text: string): string {
return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
}

function hasReadmeDevInstallHint(packageName: string, readmeContent?: string | null): boolean {
if (!readmeContent) return false

const escapedName = escapeRegExp(packageName)
const escapedNpmName = escapeRegExp(`npm:${packageName}`)
const escapedName = regExpEscape(packageName)
const escapedNpmName = regExpEscape(`npm:${packageName}`)
const packageSpec = `(?:${escapedName}|${escapedNpmName})(?:@[\\w.-]+)?`

const patterns = [
Expand Down
Loading