Skip to content

Commit

Permalink
Merge branch 'main' into route-relative
Browse files Browse the repository at this point in the history
  • Loading branch information
Mister-Hope committed Apr 15, 2024
2 parents b5c5fd7 + a33ca46 commit 562feca
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion e2e/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default defineConfig({
forbidOnly: isCI,
reporter: isCI ? 'github' : 'line',
retries: isCI ? 2 : 0,
workers: isCI || isDev ? 1 : undefined,
workers: isDev ? 1 : undefined,
projects: [
{
name: 'chromium',
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/utils/resolveRoutePathFromUrl.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const resolveRoutePathFromUrl = (url: string, base = '/'): string => {
const pathname = url
// remove url origin
.replace(/^(https?:)?\/\/[^/]*/, '')
.replace(/^(?:https?:)?\/\/[^/]*/, '')

// remove site base
return pathname.startsWith(base)
Expand Down

0 comments on commit 562feca

Please sign in to comment.