Skip to content

Commit 3a229e3

Browse files
transitive-bullshittransitive-bullshit
committed
🔞
1 parent 44026d9 commit 3a229e3

19 files changed

+56
-54
lines changed

‎.prettierrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"importOrder": [
1212
"^(react/(.*)$)|^(react$)|^(next/(.*)$)|^(next$)",
1313
"<THIRD_PARTY_MODULES>",
14-
"^(lib/(.*)$)|^(components/(.*)$)|^(styles/(.*)$)",
14+
"^(@/lib/(.*)$)|^(@/components/(.*)$)|^(@/styles/(.*)$)",
1515
"^[./]"
1616
],
1717
"importOrderSeparation": true,

‎components/Footer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { FaZhihu } from '@react-icons/all-files/fa/FaZhihu'
99
import { IoMoonSharp } from '@react-icons/all-files/io5/IoMoonSharp'
1010
import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline'
1111

12-
import * as config from 'lib/config'
13-
import { useDarkMode } from 'lib/use-dark-mode'
12+
import * as config from '@/lib/config'
13+
import { useDarkMode } from '@/lib/use-dark-mode'
1414

1515
import styles from './styles.module.css'
1616

‎components/NotionPage.tsx

+6-9
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,21 @@ import { useRouter } from 'next/router'
66

77
import cs from 'classnames'
88
import { PageBlock } from 'notion-types'
9-
// utils
109
import { formatDate, getBlockTitle, getPageProperty } from 'notion-utils'
1110
import BodyClassName from 'react-body-classname'
12-
// core notion renderer
1311
import { NotionRenderer } from 'react-notion-x'
1412
import TweetEmbed from 'react-tweet-embed'
1513
import { useSearchParam } from 'react-use'
1614

17-
import * as config from 'lib/config'
18-
import * as types from 'lib/types'
19-
import { mapImageUrl } from 'lib/map-image-url'
20-
import { getCanonicalPageUrl, mapPageUrl } from 'lib/map-page-url'
21-
import { searchNotion } from 'lib/search-notion'
22-
import { useDarkMode } from 'lib/use-dark-mode'
15+
import * as config from '@/lib/config'
16+
import * as types from '@/lib/types'
17+
import { mapImageUrl } from '@/lib/map-image-url'
18+
import { getCanonicalPageUrl, mapPageUrl } from '@/lib/map-page-url'
19+
import { searchNotion } from '@/lib/search-notion'
20+
import { useDarkMode } from '@/lib/use-dark-mode'
2321

2422
import { Footer } from './Footer'
2523
import { GitHubShareButton } from './GitHubShareButton'
26-
// components
2724
import { Loading } from './Loading'
2825
import { NotionPageHeader } from './NotionPageHeader'
2926
import { Page404 } from './Page404'

‎components/NotionPageHeader.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { IoSunnyOutline } from '@react-icons/all-files/io5/IoSunnyOutline'
66
import cs from 'classnames'
77
import { Breadcrumbs, Header, Search, useNotionContext } from 'react-notion-x'
88

9-
import { isSearchEnabled, navigationLinks, navigationStyle } from 'lib/config'
10-
import { useDarkMode } from 'lib/use-dark-mode'
9+
import { isSearchEnabled, navigationLinks, navigationStyle } from '@/lib/config'
10+
import { useDarkMode } from '@/lib/use-dark-mode'
1111

1212
import styles from './styles.module.css'
1313

‎components/Page404.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react'
22

3-
import * as types from 'lib/types'
3+
import * as types from '@/lib/types'
44

55
import { PageHead } from './PageHead'
66
import styles from './styles.module.css'

‎components/PageAside.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react'
22

33
import { Block, ExtendedRecordMap } from 'notion-types'
44

5-
import { getPageTweet } from 'lib/get-page-tweet'
5+
import { getPageTweet } from '@/lib/get-page-tweet'
66

77
import { PageActions } from './PageActions'
88
import { PageSocial } from './PageSocial'

‎components/PageHead.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as React from 'react'
22
import Head from 'next/head'
33

4-
import * as config from 'lib/config'
5-
import * as types from 'lib/types'
6-
import { getSocialImageUrl } from 'lib/get-social-image-url'
4+
import * as config from '@/lib/config'
5+
import * as types from '@/lib/types'
6+
import { getSocialImageUrl } from '@/lib/get-social-image-url'
77

88
export const PageHead: React.FC<
99
types.PageProps & {

‎components/PageSocial.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react'
22

33
import cs from 'classnames'
44

5-
import * as config from 'lib/config'
5+
import * as config from '@/lib/config'
66

77
import styles from './PageSocial.module.css'
88

‎pages/404.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import { Page404 } from 'components'
1+
import { Page404 } from '@/components'
22

33
export default Page404

‎pages/[pageId].tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import * as React from 'react'
22
import { GetStaticProps } from 'next'
33

4-
import { NotionPage } from 'components'
4+
import { NotionPage } from '@/components'
55

6-
import { domain, isDev } from 'lib/config'
7-
import { getSiteMap } from 'lib/get-site-map'
8-
import { resolveNotionPage } from 'lib/resolve-notion-page'
9-
import { PageProps, Params } from 'lib/types'
6+
import { domain, isDev } from '@/lib/config'
7+
import { getSiteMap } from '@/lib/get-site-map'
8+
import { resolveNotionPage } from '@/lib/resolve-notion-page'
9+
import { PageProps, Params } from '@/lib/types'
1010

1111
export const getStaticProps: GetStaticProps<PageProps, Params> = async (
1212
context

‎pages/_app.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ import posthog from 'posthog-js'
1111
import 'prismjs/themes/prism-coy.css'
1212
// core styles shared by all of react-notion-x (required)
1313
import 'react-notion-x/src/styles.css'
14-
15-
import { bootstrap } from 'lib/bootstrap-client'
16-
import {
17-
fathomConfig,
18-
fathomId,
19-
isServer,
20-
posthogConfig,
21-
posthogId
22-
} from 'lib/config'
2314
import 'styles/global.css'
2415
// this might be better for dark mode
2516
// import 'prismjs/themes/prism-okaidia.css'
@@ -28,6 +19,15 @@ import 'styles/notion.css'
2819
// global style overrides for prism theme (optional)
2920
import 'styles/prism-theme.css'
3021

22+
import { bootstrap } from '@/lib/bootstrap-client'
23+
import {
24+
fathomConfig,
25+
fathomId,
26+
isServer,
27+
posthogConfig,
28+
posthogId
29+
} from '@/lib/config'
30+
3131
if (!isServer) {
3232
bootstrap()
3333
}

‎pages/_error.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import { ErrorPage } from 'components'
1+
import { ErrorPage } from '@/components'
22

33
export default ErrorPage

‎pages/api/notion-page-info.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99
parsePageId
1010
} from 'notion-utils'
1111

12-
import * as libConfig from 'lib/config'
13-
import { mapImageUrl } from 'lib/map-image-url'
14-
import { notion } from 'lib/notion-api'
15-
import { NotionPageInfo } from 'lib/types'
12+
import * as libConfig from '@/lib/config'
13+
import { mapImageUrl } from '@/lib/map-image-url'
14+
import { notion } from '@/lib/notion-api'
15+
import { NotionPageInfo } from '@/lib/types'
1616

1717
export default async (req: NextApiRequest, res: NextApiResponse) => {
1818
if (req.method !== 'POST') {

‎pages/api/social-image.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { NextRequest } from 'next/server'
33

44
import { ImageResponse } from '@vercel/og'
55

6-
import { api, apiHost } from 'lib/config'
7-
import { NotionPageInfo } from 'lib/types'
6+
import { api, apiHost } from '@/lib/config'
7+
import { NotionPageInfo } from '@/lib/types'
88

99
const interRegularFontP = fetch(
1010
new URL('../../public/fonts/Inter-Regular.ttf', import.meta.url)

‎pages/feed.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99
} from 'notion-utils'
1010
import RSS from 'rss'
1111

12-
import * as config from 'lib/config'
13-
import { getSiteMap } from 'lib/get-site-map'
14-
import { getSocialImageUrl } from 'lib/get-social-image-url'
15-
import { getCanonicalPageUrl } from 'lib/map-page-url'
12+
import * as config from '@/lib/config'
13+
import { getSiteMap } from '@/lib/get-site-map'
14+
import { getSocialImageUrl } from '@/lib/get-social-image-url'
15+
import { getCanonicalPageUrl } from '@/lib/map-page-url'
1616

1717
export const getServerSideProps: GetServerSideProps = async ({ req, res }) => {
1818
if (req.method !== 'GET') {

‎pages/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as React from 'react'
22

3-
import { NotionPage } from 'components'
3+
import { NotionPage } from '@/components'
44

5-
import { domain } from 'lib/config'
6-
import { resolveNotionPage } from 'lib/resolve-notion-page'
5+
import { domain } from '@/lib/config'
6+
import { resolveNotionPage } from '@/lib/resolve-notion-page'
77

88
export const getStaticProps = async () => {
99
try {

‎pages/robots.txt.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { GetServerSideProps } from 'next'
22

3-
import { host } from 'lib/config'
3+
import { host } from '@/lib/config'
44

55
export const getServerSideProps: GetServerSideProps = async ({ req, res }) => {
66
if (req.method !== 'GET') {

‎pages/sitemap.xml.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { GetServerSideProps } from 'next'
22

3-
import { host } from 'lib/config'
4-
import { getSiteMap } from 'lib/get-site-map'
5-
import type { SiteMap } from 'lib/types'
3+
import { host } from '@/lib/config'
4+
import { getSiteMap } from '@/lib/get-site-map'
5+
import type { SiteMap } from '@/lib/types'
66

77
export const getServerSideProps: GetServerSideProps = async ({ req, res }) => {
88
if (req.method !== 'GET') {

‎tsconfig.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
"jsx": "preserve",
1717
"baseUrl": ".",
1818
"typeRoots": ["./node_modules/@types"],
19-
"incremental": true
19+
"incremental": true,
20+
"paths": {
21+
"@/components/*": ["components/*"],
22+
"@/lib/*": ["lib/*"],
23+
"@/styles/*": ["styles/*"]
24+
}
2025
},
2126
"exclude": ["node_modules"],
2227
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "site.config.ts"]

0 commit comments

Comments
 (0)