Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: generate path directly under route groups directory #187

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: generate path directly under route groups directory #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions projects/nextjs-appdir/app/xxx/(group3)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import Link from 'next/link'

export type OptionalQuery = { hoge: string }

// `onClick`, `href`, and `ref` need to be passed to the DOM element
// for proper handling
const MyButton = React.forwardRef(({ onClick, href }, ref) => {
return (
<a href={href} onClick={onClick} ref={ref}>
Click Me
</a>
)
})

function Home() {
return (
<Link href="/about" passHref>
<MyButton />
</Link>
)
}

export default Home
23 changes: 23 additions & 0 deletions projects/nextjs-appdir/app/xxx/(group3)/yyy/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import Link from 'next/link'

export type OptionalQuery = { hoge: string }

// `onClick`, `href`, and `ref` need to be passed to the DOM element
// for proper handling
const MyButton = React.forwardRef(({ onClick, href }, ref) => {
return (
<a href={href} onClick={onClick} ref={ref}>
Click Me
</a>
)
})

function Home() {
return (
<Link href="/about" passHref>
<MyButton />
</Link>
)
}

export default Home
8 changes: 8 additions & 0 deletions projects/nextjs-appdir/lib/$path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { Query as Query_1j04kwd } from '../app/page';
import type { OptionalQuery as OptionalQuery_1qd20e9 } from '../app/(group1)/[pid]/page';
import type { Query as Query_g05ywg } from '../app/(group1)/blog/[...slug]/page';
import type { OptionalQuery as OptionalQuery_s8tu8q } from '../app/xxx/(group3)/page';
import type { OptionalQuery as OptionalQuery_ywjxi8 } from '../app/xxx/(group3)/yyy/page';
import type { OptionalQuery as OptionalQuery_19vdpqy } from '../pages/children/[pid]';
import type { Query as Query_1rrk9o7 } from '../pages/children/blog/[...slug]';

Expand Down Expand Up @@ -55,6 +57,12 @@ export const pagesPath = {
})
}
}),
"xxx": {
"yyy": {
$url: (url?: { query?: OptionalQuery_ywjxi8, hash?: string }) => ({ pathname: '/xxx/yyy' as const, query: url?.query, hash: url?.hash, path: `/xxx/yyy${buildSuffix(url)}` })
},
$url: (url?: { query?: OptionalQuery_s8tu8q, hash?: string }) => ({ pathname: '/xxx' as const, query: url?.query, hash: url?.hash, path: `/xxx${buildSuffix(url)}` })
},
$url: (url: { query: Query_1j04kwd, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash, path: `/${buildSuffix(url)}` }),
"children": {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
Expand Down
8 changes: 8 additions & 0 deletions projects/nextjs-appdir/out/lib/basic/$path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { Query as Query_1yksaqv } from '../../../app/page';
import type { OptionalQuery as OptionalQuery_a6l6vr } from '../../../app/(group1)/[pid]/page';
import type { Query as Query_46sa06 } from '../../../app/(group1)/blog/[...slug]/page';
import type { OptionalQuery as OptionalQuery_1cjq374 } from '../../../app/xxx/(group3)/page';
import type { OptionalQuery as OptionalQuery_75amui } from '../../../app/xxx/(group3)/yyy/page';
import type { OptionalQuery as OptionalQuery_1b52tdg } from '../../../pages/children/[pid]';
import type { Query as Query_9ixms9 } from '../../../pages/children/blog/[...slug]';

Expand Down Expand Up @@ -52,6 +54,12 @@ export const pagesPath = {
})
}
}),
"xxx": {
"yyy": {
$url: (url?: { query?: OptionalQuery_75amui, hash?: string }) => ({ pathname: '/xxx/yyy' as const, query: url?.query, hash: url?.hash, path: `/xxx/yyy${buildSuffix(url)}` })
},
$url: (url?: { query?: OptionalQuery_1cjq374, hash?: string }) => ({ pathname: '/xxx' as const, query: url?.query, hash: url?.hash, path: `/xxx${buildSuffix(url)}` })
},
$url: (url: { query: Query_1yksaqv, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash, path: `/${buildSuffix(url)}` }),
"children": {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
Expand Down
8 changes: 8 additions & 0 deletions projects/nextjs-appdir/out/lib/ignore/$path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { Query as Query_1yksaqv } from '../../../app/page';
import type { OptionalQuery as OptionalQuery_a6l6vr } from '../../../app/(group1)/[pid]/page';
import type { Query as Query_46sa06 } from '../../../app/(group1)/blog/[...slug]/page';
import type { OptionalQuery as OptionalQuery_1cjq374 } from '../../../app/xxx/(group3)/page';
import type { OptionalQuery as OptionalQuery_75amui } from '../../../app/xxx/(group3)/yyy/page';
import type { OptionalQuery as OptionalQuery_1b52tdg } from '../../../pages/children/[pid]';
import type { Query as Query_9ixms9 } from '../../../pages/children/blog/[...slug]';

Expand Down Expand Up @@ -52,6 +54,12 @@ export const pagesPath = {
})
}
}),
"xxx": {
"yyy": {
$url: (url?: { query?: OptionalQuery_75amui, hash?: string }) => ({ pathname: '/xxx/yyy' as const, query: url?.query, hash: url?.hash, path: `/xxx/yyy${buildSuffix(url)}` })
},
$url: (url?: { query?: OptionalQuery_1cjq374, hash?: string }) => ({ pathname: '/xxx' as const, query: url?.query, hash: url?.hash, path: `/xxx${buildSuffix(url)}` })
},
$url: (url: { query: Query_1yksaqv, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash, path: `/${buildSuffix(url)}` }),
"children": {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
Expand Down
8 changes: 8 additions & 0 deletions projects/nextjs-appdir/out/lib/static/$path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { Query as Query_1yksaqv } from '../../../app/page';
import type { OptionalQuery as OptionalQuery_a6l6vr } from '../../../app/(group1)/[pid]/page';
import type { Query as Query_46sa06 } from '../../../app/(group1)/blog/[...slug]/page';
import type { OptionalQuery as OptionalQuery_1cjq374 } from '../../../app/xxx/(group3)/page';
import type { OptionalQuery as OptionalQuery_75amui } from '../../../app/xxx/(group3)/yyy/page';
import type { OptionalQuery as OptionalQuery_1b52tdg } from '../../../pages/children/[pid]';
import type { Query as Query_9ixms9 } from '../../../pages/children/blog/[...slug]';

Expand Down Expand Up @@ -55,6 +57,12 @@ export const pagesPath = {
})
}
}),
"xxx": {
"yyy": {
$url: (url?: { query?: OptionalQuery_75amui, hash?: string }) => ({ pathname: '/xxx/yyy' as const, query: url?.query, hash: url?.hash, path: `/xxx/yyy${buildSuffix(url)}` })
},
$url: (url?: { query?: OptionalQuery_1cjq374, hash?: string }) => ({ pathname: '/xxx' as const, query: url?.query, hash: url?.hash, path: `/xxx${buildSuffix(url)}` })
},
$url: (url: { query: Query_1yksaqv, hash?: string }) => ({ pathname: '/' as const, query: url.query, hash: url.hash, path: `/${buildSuffix(url)}` }),
"children": {
"%E6%97%A5%E6%9C%AC%E8%AA%9E": {
Expand Down
16 changes: 15 additions & 1 deletion src/nextjs/parseAppDir.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,21 @@ export const parseAppDir = (
const newSlugs = [...slugs];
const target = path.posix.join(targetDir, file);
if (file.startsWith('(') && file.endsWith(')')) {
return createPathObjString(target, indent.slice(2), url, newSlugs, '<% props %>');
const indexFile = fs.readdirSync(target).find(name => pageFileNames.includes(name));
return createPathObjString(
target,
indent.slice(2),
url,
newSlugs,
'<% props %>',
indexFile &&
createMethods(
indent.slice(2),
getImportName(path.posix.join(target, indexFile)),
newSlugs,
url
)
);
}

const newUrl = `${url}/${file}`;
Expand Down
Loading