📯

transitive-bullshit · transitive-bullshit · commit e9629b6aa195 · 2024-10-31T18:48:04.000-05:00
diff --git a/examples/full/next.config.js b/examples/full/next.config.js
@@ -1,9 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const withBundleAnalyzer = require('@next/bundle-analyzer')({
-  enabled: process.env.ANALYZE === 'true'
-})
-
-module.exports = withBundleAnalyzer({
+export default {
   staticPageGenerationTimeout: 300,
   images: {
     domains: [
@@ -15,4 +10,4 @@ module.exports = withBundleAnalyzer({
     ],
     formats: ['image/avif', 'image/webp']
   }
-})
+}
diff --git a/examples/full/package.json b/examples/full/package.json
@@ -7,9 +7,6 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "analyze": "cross-env ANALYZE=true next build",
-    "analyze:server": "cross-env BUNDLE_ANALYZE=server next build",
-    "analyze:browser": "cross-env BUNDLE_ANALYZE=browser next build",
     "deploy": "vercel deploy",
     "test": "run-s test:*",
     "test:lint": "eslint ."
@@ -32,7 +29,6 @@
     "react-tweet-embed": "^2.0.0"
   },
   "devDependencies": {
-    "@next/bundle-analyzer": "^15.0.2",
     "cross-env": "^7.0.3"
   }
 }
diff --git a/examples/full/turbo.json b/examples/full/turbo.json
@@ -0,0 +1,8 @@
+{
+  "extends": ["//"],
+  "tasks": {
+    "build": {
+      "outputs": [".next/**", "!.next/cache/**"]
+    }
+  }
+}
diff --git a/examples/minimal/next.config.js b/examples/minimal/next.config.js
@@ -1,9 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const withBundleAnalyzer = require('@next/bundle-analyzer')({
-  enabled: process.env.ANALYZE === 'true'
-})
-
-module.exports = withBundleAnalyzer({
+export default {
   staticPageGenerationTimeout: 300,
   images: {
     domains: [
@@ -14,4 +9,4 @@ module.exports = withBundleAnalyzer({
     ],
     formats: ['image/avif', 'image/webp']
   }
-})
+}
diff --git a/examples/minimal/turbo.json b/examples/minimal/turbo.json
@@ -0,0 +1,8 @@
+{
+  "extends": ["//"],
+  "tasks": {
+    "build": {
+      "outputs": [".next/**", "!.next/cache/**"]
+    }
+  }
+}
diff --git a/packages/notion-types/package.json b/packages/notion-types/package.json
@@ -6,6 +6,8 @@
   "repository": "NotionX/react-notion-x",
   "author": "Travis Fischer <travis@transitivebullsh.it>",
   "license": "MIT",
+  "main": "./build/index.js",
+  "module": "./build/index.js",
   "types": "./build/index.d.ts",
   "sideEffects": false,
   "files": [
diff --git a/packages/react-notion-x/package.json b/packages/react-notion-x/package.json
@@ -27,12 +27,12 @@
   "dependencies": {
     "@fisch0920/medium-zoom": "^1.0.7",
     "@matejmazur/react-katex": "^3.1.3",
-    "katex": "^0.15.6",
+    "katex": "^0.16.11",
     "notion-types": "workspace:*",
     "notion-utils": "workspace:*",
     "prismjs": "^1.27.0",
     "react-fast-compare": "^3.2.0",
-    "react-hotkeys-hook": "^3.4.7",
+    "react-hotkeys-hook": "^4.5.1",
     "react-image": "^4.0.3",
     "react-lazy-images": "^1.1.0",
     "react-modal": "^3.14.3",
@@ -45,7 +45,7 @@
     "@types/react": "^18.3.12",
     "@types/react-modal": "^3.16.3",
     "clipboard-copy": "^4.0.1",
-    "date-fns": "^2.28.0",
+    "date-fns": "^2.30.0",
     "format-number": "^3.0.0",
     "lodash.throttle": "^4.1.1"
   },
diff --git a/packages/react-notion-x/src/components/asset-wrapper.tsx b/packages/react-notion-x/src/components/asset-wrapper.tsx
@@ -62,7 +62,7 @@ export const AssetWrapper: React.FC<{
         target={
           captionHostname &&
           captionHostname !== rootDomain &&
-          !caption.startsWith('/')
+          !caption?.startsWith('/')
             ? 'blank_'
             : null
         }
diff --git a/packages/react-notion-x/src/components/asset.tsx b/packages/react-notion-x/src/components/asset.tsx
@@ -135,7 +135,7 @@ export const Asset: React.FC<{
     const src = source
     if (!src) return null
 
-    const id = src.split('?')[0]?.split('/').pop()
+    const id = src.split('?')?.[0]?.split('/').pop()
     if (!id) return null
 
     content = (
diff --git a/packages/react-notion-x/src/components/eoi.tsx b/packages/react-notion-x/src/components/eoi.tsx
@@ -18,9 +18,9 @@ export const EOI: React.FC<{
     return null
   }
 
-  const title = attributes.find((attr) => attr.id === 'title')?.values[0]
-  let owner = attributes.find((attr) => attr.id === 'owner')?.values[0]
-  const lastUpdatedAt = attributes.find((attr) => attr.id === 'updated_at')
+  const title = attributes.find((attr: any) => attr.id === 'title')?.values[0]
+  let owner = attributes.find((attr: any) => attr.id === 'owner')?.values[0]
+  const lastUpdatedAt = attributes.find((attr: any) => attr.id === 'updated_at')
     ?.values[0]
   const lastUpdated = lastUpdatedAt ? formatNotionDateTime(lastUpdatedAt) : null
   let externalImage: React.ReactNode
diff --git a/packages/react-notion-x/src/components/google-drive.tsx b/packages/react-notion-x/src/components/google-drive.tsx
@@ -31,7 +31,7 @@ export const GoogleDrive: React.FC<{
       >
         <div className='notion-google-drive-preview'>
           <GracefulImage
-            src={mapImageUrl(properties.thumbnail, block)}
+            src={mapImageUrl(properties.thumbnail, block)!}
             alt={properties.title || 'Google Drive Document'}
             loading='lazy'
           />
diff --git a/packages/react-notion-x/src/components/lazy-image.tsx b/packages/react-notion-x/src/components/lazy-image.tsx
@@ -82,6 +82,7 @@ export const LazyImage: React.FC<{
     }
 
     return (
+      // @ts-expect-error LazyImage types are out-of-date.
       <LazyImageFull src={src!} {...rest} experimentalDecode={true}>
         {({ imageState, ref }) => {
           const isLoaded = imageState === ImageState.LoadSuccess
diff --git a/packages/react-notion-x/src/components/mention-preview-card.tsx b/packages/react-notion-x/src/components/mention-preview-card.tsx
@@ -1,12 +1,14 @@
 import type React from 'react'
 
-function capitalizeFirstLetter(str) {
+function capitalizeFirstLetter(str?: string) {
+  if (!str) return ''
+
   return str.charAt(0).toUpperCase() + str.slice(1)
 }
 
 export const MentionPreviewCard: React.FC<{
   owner?: string
-  lastUpdated?: string
+  lastUpdated?: string | null
   title: string
   domain: string
   externalImage?: React.ReactNode
diff --git a/packages/react-notion-x/src/map-image-url.ts b/packages/react-notion-x/src/map-image-url.ts
@@ -1,7 +1,7 @@
 import { type Block } from 'notion-types'
 
 export const defaultMapImageUrl = (
-  url: string,
+  url: string | undefined,
   block: Block
 ): string | undefined => {
   if (!url) {
diff --git a/packages/react-notion-x/src/types.ts b/packages/react-notion-x/src/types.ts
@@ -6,7 +6,7 @@ export type MapPageUrlFn = (
   recordMap?: types.ExtendedRecordMap | undefined
 ) => string
 export type MapImageUrlFn = (
-  url: string,
+  url: string | undefined,
   block: types.Block
 ) => string | undefined
 export type SearchNotionFn = (
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/turbo.json b/turbo.json

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ export const AssetWrapper: React.FC<{`
`62`	`62`	`target={`
`63`	`63`	`captionHostname &&`
`64`	`64`	`captionHostname !== rootDomain &&`
`65`		`- !caption.startsWith('/')`
	`65`	`+ !caption?.startsWith('/')`
`66`	`66`	`? 'blank_'`
`67`	`67`	`: null`
`68`	`68`	`}`