🐵

NotionX · Oct 31, 2024 · 07e0280 · 07e0280
1 parent 05fb629
commit 07e0280
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 31 deletions.
diff --git a/examples/minimal/tsconfig.json b/examples/minimal/tsconfig.json
@@ -1,16 +1,15 @@
 {
   "compilerOptions": {
-    "target": "es2016",
-    "lib": ["dom", "esnext"],
-    "allowJs": false,
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
     "skipLibCheck": true,
     "strict": false,
     "forceConsistentCasingInFileNames": true,
-    "experimentalDecorators": true,
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",

diff --git a/packages/notion-client/package.json b/packages/notion-client/package.json
@@ -19,6 +19,7 @@
   "scripts": {
     "build": "tsup",
     "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
+    "clean": "del build",
     "test": "run-s test:*",
     "test:lint": "eslint .",
     "test:typecheck": "tsc --noEmit",

diff --git a/packages/notion-compat/package.json b/packages/notion-compat/package.json
@@ -19,6 +19,7 @@
   "scripts": {
     "build": "tsup",
     "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
+    "clean": "del build",
     "test": "run-s test:*",
     "test:lint": "eslint .",
     "test:typecheck": "tsc --noEmit",

diff --git a/packages/notion-types/package.json b/packages/notion-types/package.json
@@ -19,6 +19,7 @@
   "scripts": {
     "build": "tsup",
     "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
+    "clean": "del build",
     "test": "run-s test:*",
     "test:lint": "eslint .",
     "test:typecheck": "tsc --noEmit"

diff --git a/packages/notion-utils/package.json b/packages/notion-utils/package.json
@@ -25,6 +25,7 @@
   "scripts": {
     "build": "tsup",
     "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
+    "clean": "del build",
     "test": "run-s test:*",
     "test:lint": "eslint .",
     "test:typecheck": "tsc --noEmit",

diff --git a/packages/react-notion-x/package.json b/packages/react-notion-x/package.json
@@ -10,6 +10,34 @@
   "module": "./build/index.js",
   "types": "./build/index.d.ts",
   "sideEffects": false,
+  "exports": {
+    ".": {
+      "types": "./build/index.d.ts",
+      "import": "./build/index.js"
+    },
+    "./build/third-party/code": {
+      "types": "./build//third-party/code.d.ts",
+      "import": "./build//third-party/code.js"
+    },
+    "./build/third-party/collection": {
+      "types": "./build//third-party/collection.d.ts",
+      "import": "./build//third-party/collection.js"
+    },
+    "./build/third-party/equation": {
+      "types": "./build//third-party/equation.d.ts",
+      "import": "./build//third-party/equation.js"
+    },
+    "./build/third-party/modal": {
+      "types": "./build//third-party/modal.d.ts",
+      "import": "./build//third-party/modal.js"
+    },
+    "./build/third-party/pdf": {
+      "types": "./build//third-party/pdf.d.ts",
+      "import": "./build//third-party/pdf.js"
+    },
+    "./styles.css": "./src/styles.css",
+    "./src/styles.css": "./src/styles.css"
+  },
   "files": [
     "build",
     "src/styles.css"
@@ -20,6 +48,7 @@
   "scripts": {
     "build": "tsup",
     "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
+    "clean": "del build",
     "test": "run-s test:*",
     "test:lint": "eslint .",
     "test:typecheck": "tsc --noEmit"

diff --git a/packages/react-notion-x/src/components/text.tsx b/packages/react-notion-x/src/components/text.tsx
@@ -249,6 +249,7 @@ export function Text({
                 const externalObjectInstance = recordMap.block[blockId]
                   ?.value as ExternalObjectInstance
 
+                console.log('eoi', blockId, externalObjectInstance)
                 return <EOI block={externalObjectInstance} inline={true} />
               }
 

diff --git a/packages/react-notion-x/src/context.tsx b/packages/react-notion-x/src/context.tsx
@@ -143,8 +143,6 @@ const defaultComponents: NotionComponents = {
   Embed: DefaultEmbed
 }
 
-console.log('DefaultHeader', { DefaultHeader, Header, defaultComponents })
-
 const defaultNotionContext: NotionContext = {
   recordMap: {
     block: {},

diff --git a/packages/react-notion-x/src/renderer.tsx b/packages/react-notion-x/src/renderer.tsx
@@ -149,7 +149,6 @@ export function NotionBlockRenderer({
 
     return null
   }
-  console.log('NotionBlockRenderer', { id, block })
 
   return (
     <Block key={id} level={level} block={block} {...props}>

diff --git a/packages/react-notion-x/tsup.config.ts b/packages/react-notion-x/tsup.config.ts
@@ -1,6 +1,6 @@
-import { defineConfig, type Options } from 'tsup'
+import { defineConfig } from 'tsup'
 
-const baseConfig: Options = {
+export default defineConfig({
   entry: [
     'src/index.tsx',
     'src/third-party/code.tsx',
@@ -14,22 +14,9 @@ const baseConfig: Options = {
   platform: 'browser',
   format: ['esm'],
   splitting: false,
-  shims: false
-}
-
-export default defineConfig([
-  {
-    ...baseConfig,
-    outDir: 'build/dev',
-    minify: false,
-    sourcemap: true,
-    dts: true
-  },
-  {
-    ...baseConfig,
-    outDir: 'build',
-    minify: false,
-    sourcemap: false,
-    dts: true
-  }
-])
+  shims: false,
+  dts: true,
+  minify: false,
+  sourcemap: true,
+  external: ['react', 'react-dom']
+})
diff --git a/tsconfig.json b/tsconfig.json
@@ -6,15 +6,15 @@
     "moduleDetection": "force",
     "noEmit": true,
     "target": "es2020",
-    "outDir": "dist",
+    "outDir": "build",
 
     "allowImportingTsExtensions": false,
     "allowJs": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "incremental": false,
     "isolatedModules": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
     "noUncheckedIndexedAccess": true,
     "resolveJsonModule": true,
     "skipLibCheck": true,