Skip to content

Commit b034119

Browse files
Merge branch 'master' into feature/support-fetch-and-edge-runtimes
2 parents 3a97527 + a5807e5 commit b034119

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+664
-82
lines changed

examples/cra/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notion-x-example-cra",
3-
"version": "6.15.6",
3+
"version": "6.16.1",
44
"private": true,
55
"scripts": {
66
"dev": "GENERATE_SOURCEMAP=false react-scripts start",
@@ -12,10 +12,10 @@
1212
"@types/node": "^16.11.26",
1313
"@types/react": "^17.0.43",
1414
"@types/react-dom": "^17.0.14",
15-
"notion-types": "^6.15.6",
15+
"notion-types": "^6.16.1",
1616
"react": "^17.0.2",
1717
"react-dom": "^17.0.2",
18-
"react-notion-x": "^6.15.6",
18+
"react-notion-x": "^6.16.1",
1919
"react-scripts": "5.0.0",
2020
"typescript": "^4.6.3"
2121
},

examples/full/components/NotionPage.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
22
import dynamic from 'next/dynamic'
33
import Head from 'next/head'
4-
import Image from 'next/image'
4+
// import Image from 'next/image'
55
import Link from 'next/link'
66
import { useRouter } from 'next/router'
77

@@ -153,7 +153,8 @@ export const NotionPage = ({
153153
rootPageId={rootPageId}
154154
previewImages={previewImagesEnabled}
155155
components={{
156-
nextImage: Image,
156+
// NOTE (transitive-bullshit 3/12/2023): I'm disabling next/image for this repo for now because the amount of traffic started costing me hundreds of dollars a month in Vercel image optimization costs. I'll probably re-enable it in the future if I can find a better solution.
157+
// nextImage: Image,
157158
nextLink: Link,
158159
Code,
159160
Collection,

examples/full/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notion-x-example-full",
3-
"version": "6.15.6",
3+
"version": "6.16.2",
44
"private": true,
55
"type": "commonjs",
66
"scripts": {
@@ -18,14 +18,14 @@
1818
"got": "^12.0.2",
1919
"lqip-modern": "^1.2.0",
2020
"next": "^12.1.0",
21-
"notion-client": "^6.15.6",
22-
"notion-compat": "^6.15.6",
23-
"notion-utils": "^6.15.6",
21+
"notion-client": "^6.16.1",
22+
"notion-compat": "^6.16.1",
23+
"notion-utils": "^6.16.1",
2424
"p-map": "^5.3.0",
2525
"p-memoize": "^6.0.1",
2626
"react": "^17.0.2",
2727
"react-dom": "^17.0.2",
28-
"react-notion-x": "^6.15.6",
28+
"react-notion-x": "^6.16.1",
2929
"react-tweet-embed": "^2.0.0"
3030
},
3131
"devDependencies": {

examples/full/pages/_app.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'prismjs/themes/prism-tomorrow.css'
77
// core styles shared by all of react-notion-x (required)
88
import 'react-notion-x/src/styles.css'
99

10+
// force push
1011
import '../styles/globals.css'
1112

1213
function MyApp({ Component, pageProps }) {

examples/minimal/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notion-x-example-minimal",
3-
"version": "6.15.6",
3+
"version": "6.16.1",
44
"private": true,
55
"type": "commonjs",
66
"scripts": {
@@ -11,11 +11,11 @@
1111
},
1212
"dependencies": {
1313
"next": "^12.1.0",
14-
"notion-client": "^6.15.6",
15-
"notion-utils": "^6.15.6",
14+
"notion-client": "^6.16.1",
15+
"notion-utils": "^6.16.1",
1616
"react": "^17.0.2",
1717
"react-dom": "^17.0.2",
18-
"react-notion-x": "^6.15.6"
18+
"react-notion-x": "^6.16.1"
1919
},
2020
"devDependencies": {
2121
"@types/node": "^16.11.2",

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.15.6",
2+
"version": "6.16.2",
33
"npmClient": "yarn",
44
"useWorkspaces": true,
55
"packages": [

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"repository": "NotionX/react-notion-x",
66
"author": "Travis Fischer <[email protected]>",
77
"license": "MIT",
8+
"version": "6.15.8",
89
"engines": {
910
"node": ">=12"
1011
},

packages/notion-client/package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notion-client",
3-
"version": "6.15.5",
3+
"version": "6.16.1",
44
"type": "module",
55
"description": "Robust TypeScript client for the unofficial Notion API.",
66
"repository": "NotionX/react-notion-x",
@@ -24,13 +24,10 @@
2424
},
2525
"dependencies": {
2626
"ky": "^0.31.4",
27-
"notion-types": "^6.15.4",
28-
"notion-utils": "^6.15.4",
27+
"notion-types": "^6.16.1",
28+
"notion-utils": "^6.16.1",
2929
"p-map": "^5.3.0"
3030
},
31-
"optionalDependencies": {
32-
"ky-universal": "^0.11.0"
33-
},
3431
"ava": {
3532
"snapshotDir": ".snapshots",
3633
"extensions": {

packages/notion-client/src/notion-api.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,9 @@ export class NotionAPI {
544544
type: 'BlocksInAncestor',
545545
source: 'quick_find_public',
546546
ancestorId: parsePageId(params.ancestorId),
547-
sort: 'Relevance',
547+
sort: {
548+
field: 'relevance'
549+
},
548550
limit: params.limit || 20,
549551
query: params.query,
550552
filters: {

packages/notion-compat/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notion-compat",
3-
"version": "6.15.5",
3+
"version": "6.16.1",
44
"type": "module",
55
"description": "Compatibility layer between the official Notion API and unofficial private API.",
66
"repository": "NotionX/react-notion-x",
@@ -22,13 +22,13 @@
2222
"test": "ava"
2323
},
2424
"dependencies": {
25-
"notion-types": "^6.15.4",
26-
"notion-utils": "^6.15.4",
25+
"notion-types": "^6.16.1",
26+
"notion-utils": "^6.16.1",
2727
"p-queue": "^7.2.0"
2828
},
2929
"devDependencies": {
3030
"@notionhq/client": "^1.0.4",
31-
"notion-client": "^6.15.5"
31+
"notion-client": "^6.16.1"
3232
},
3333
"peerDependencies": {
3434
"@notionhq/client": "^1.0.4"

0 commit comments

Comments
 (0)