Skip to content

Commit 7f7405a

Browse files
authored
Merge branch 'main' into route-option
2 parents 80538a1 + a33ca46 commit 7f7405a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

e2e/playwright.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default defineConfig({
1010
forbidOnly: isCI,
1111
reporter: isCI ? 'github' : 'line',
1212
retries: isCI ? 2 : 0,
13-
workers: isCI || isDev ? 1 : undefined,
13+
workers: isDev ? 1 : undefined,
1414
projects: [
1515
{
1616
name: 'chromium',

packages/shared/src/utils/resolveRoutePathFromUrl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const resolveRoutePathFromUrl = (url: string, base = '/'): string => {
22
const pathname = url
33
// remove url origin
4-
.replace(/^(https?:)?\/\/[^/]*/, '')
4+
.replace(/^(?:https?:)?\/\/[^/]*/, '')
55

66
// remove site base
77
return pathname.startsWith(base)

0 commit comments

Comments
 (0)