build with tsup and turbo

FranciscoMoretti · FranciscoMoretti · commit d30334af8ba5 · 2023-04-02T20:49:20.000+01:00
diff --git a/examples/cra/package.json b/examples/cra/package.json
@@ -3,16 +3,18 @@
   "version": "6.16.0",
   "private": true,
   "scripts": {
-    "dev": "GENERATE_SOURCEMAP=false react-scripts start",
     "start": "GENERATE_SOURCEMAP=false react-scripts start",
     "build": "GENERATE_SOURCEMAP=false react-scripts build",
-    "eject": "GENERATE_SOURCEMAP=false react-scripts eject"
+    "dev": "GENERATE_SOURCEMAP=false react-scripts start",
+    "eject": "GENERATE_SOURCEMAP=false react-scripts eject",
+    "lint": "eslint \"src/**/*.ts*\"",
+    "clean": "rm -rf build"
   },
   "dependencies": {
     "@types/node": "^16.11.26",
     "@types/react": "^17.0.43",
     "@types/react-dom": "^17.0.14",
-    "notion-types": "^6.15.6",
+    "notion-types": "workspace:*",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-notion-x": "workspace:*",
diff --git a/examples/full/package.json b/examples/full/package.json
@@ -4,8 +4,10 @@
   "private": true,
   "type": "commonjs",
   "scripts": {
-    "dev": "next dev",
     "build": "next build",
+    "clean": "rm -rf .next",
+    "dev": "next dev",
+    "lint": "next lint",
     "start": "next start",
     "analyze": "cross-env ANALYZE=true next build",
     "analyze:server": "cross-env BUNDLE_ANALYZE=server next build",
@@ -19,7 +21,7 @@
     "lqip-modern": "^1.2.0",
     "next": "^12.1.0",
     "notion-client": "workspace:*",
-    "notion-compat": "^6.16.0",
+    "notion-compat": "workspace:*",
     "notion-types": "workspace:*",
     "notion-utils": "workspace:*",
     "p-map": "^5.3.0",
diff --git a/examples/full/tsconfig.json b/examples/full/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "es2016",
     "lib": ["dom", "esnext"],
     "allowJs": false,
+    "composite": false,
     "skipLibCheck": true,
     "strict": false,
     "forceConsistentCasingInFileNames": true,
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -4,8 +4,10 @@
   "private": true,
   "type": "commonjs",
   "scripts": {
-    "dev": "next dev",
     "build": "next build",
+    "clean": "rm -rf .next",
+    "dev": "next dev",
+    "lint": "next lint",
     "start": "next start",
     "deploy": "vercel deploy"
   },
diff --git a/examples/minimal/tsconfig.json b/examples/minimal/tsconfig.json
@@ -3,6 +3,7 @@
     "target": "es2016",
     "lib": ["dom", "esnext"],
     "allowJs": false,
+    "composite": false,
     "skipLibCheck": true,
     "strict": false,
     "forceConsistentCasingInFileNames": true,
diff --git a/package.json b/package.json
@@ -15,18 +15,16 @@
   ],
   "scripts": {
     "build": "turbo run build",
-    "build:tsc": "tsc --build",
-    "watch": "run-p watch:* --continue-on-error",
-    "watch:tsc": "tsc --build --watch  --preserveWatchOutput",
-    "dev": "turbo run dev",
-    "clean": "del packages/*/build",
+    "clean": "turbo run clean",
+    "dev": "turbo run dev --no-cache  --continue",
+    "format": "prettier --write \"**/*.{ts,tsx,md}\"",
+    "lint": "turbo run lint",
     "pretest": "run-s build",
     "start": "turbo run start",
     "test": "run-p test:*",
     "test:unit": "turbo run test",
     "test:eslint": "eslint '**/*.{ts,tsx}'",
     "test:prettier": "prettier '**/*.{js,jsx,ts,tsx}' --check",
-    "types": "turbo run types",
     "predeploy": "run-s build",
     "prepare": "husky install",
     "pre-commit": "lint-staged"
diff --git a/packages/notion-client/package.json b/packages/notion-client/package.json
@@ -18,7 +18,9 @@
   },
   "scripts": {
     "build": "tsup",
-    "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
+    "clean": "rm -rf build",
+    "dev": "tsup --watch",
+    "lint": "eslint '**/*.{ts,tsx}'",
     "test": "ava"
   },
   "dependencies": {
diff --git a/packages/notion-client/tsconfig.json b/packages/notion-client/tsconfig.json
@@ -1,12 +1,13 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
-    "composite": true,
+    "composite": false,
     "rootDir": "src",
     "outDir": "build",
     "tsBuildInfoFile": "build/.tsbuildinfo",
     "emitDeclarationOnly": true
   },
-  "include": ["src"],
-  "references": [{ "path": "../notion-types" }, { "path": "../notion-utils" }]
+  "include": [
+    "src/**/*"
+  ],
 }
diff --git a/packages/notion-client/tsup.config.ts b/packages/notion-client/tsup.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'tsup'
 export default defineConfig({
   entry: ['src/index.ts'],
   outDir: 'build',
+  dts: true,
   target: 'node14',
   platform: 'node',
   format: ['esm'],
diff --git a/packages/notion-compat/package.json b/packages/notion-compat/package.json
@@ -18,7 +18,9 @@
   },
   "scripts": {
     "build": "tsup",
-    "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
+    "clean": "rm -rf build",
+    "dev": "tsup --watch",
+    "lint": "eslint '**/*.{ts,tsx}'",
     "test": "ava"
   },
   "dependencies": {
diff --git a/packages/notion-compat/tsconfig.json b/packages/notion-compat/tsconfig.json
@@ -1,16 +1,14 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
-    "composite": true,
+    "composite": false,
     "rootDir": "src",
     "outDir": "build",
     "tsBuildInfoFile": "build/.tsbuildinfo",
     "emitDeclarationOnly": true
   },
-  "include": ["src"],
-  "references": [
-    { "path": "../notion-types" },
-    { "path": "../notion-utils" },
-    { "path": "../notion-client" }
-  ]
+  "include": [
+    "src/**/*"
+  ],
+
 }
diff --git a/packages/notion-compat/tsup.config.ts b/packages/notion-compat/tsup.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'tsup'
 export default defineConfig({
   entry: ['src/index.ts'],
   outDir: 'build',
+  dts: true,
   target: 'node14',
   platform: 'node',
   format: ['esm'],
diff --git a/packages/notion-types/package.json b/packages/notion-types/package.json
@@ -6,15 +6,17 @@
   "repository": "NotionX/react-notion-x",
   "author": "Travis Fischer <travis@transitivebullsh.it>",
   "license": "MIT",
-  "types": "./types/index.d.ts",
+  "types": "./build/index.d.ts",
   "sideEffects": false,
   "files": [
     "build"
   ],
   "scripts": {
-    "build": "tsc --emitDeclarationOnly --declaration",
-    "watch": "tsup --watch --silent --onSuccess 'echo build successful'"
-  },
+    "build": "tsup",
+    "clean": "rm -rf build",
+    "dev": "tsup --watch",
+    "lint": "eslint '**/*.{ts,tsx}'"
+    },
   "engines": {
     "node": ">=12"
   }
diff --git a/packages/notion-types/tsconfig.json b/packages/notion-types/tsconfig.json
@@ -1,14 +1,14 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
-    "composite": true,
+    "composite": false,
     "rootDir": "src",
     "outDir": "build",
-    "declarationDir": "./types",
     "tsBuildInfoFile": "build/.tsbuildinfo",
     "declarationMap": true, // Allow navigation to definition in VS Code https://stackoverflow.com/questions/54459847/vscode-lerna-typescript-monorepo-code-navigation
     "emitDeclarationOnly": true,
     "noUnusedLocals": false, // / won't fail on unused variables
   },
-  "include": ["src"]
-}
+  "include": [
+    "src/**/*"
+  ],}
diff --git a/packages/notion-types/tsup.config.ts b/packages/notion-types/tsup.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'tsup'
 export default defineConfig({
   entry: ['src/index.ts'],
   outDir: 'build',
+  dts: true,
   target: 'es2015',
   platform: 'browser',
   format: ['esm'],
diff --git a/packages/notion-utils/package.json b/packages/notion-utils/package.json
@@ -24,8 +24,9 @@
   },
   "scripts": {
     "build": "tsup",
-    "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
-    "dev": "npm run build -- --watch",
+    "clean": "rm -rf build",
+    "dev": "tsup --watch",
+    "lint": "eslint '**/*.{ts,tsx}'",
     "test": "ava"
   },
   "dependencies": {
diff --git a/packages/notion-utils/tsconfig.json b/packages/notion-utils/tsconfig.json
@@ -1,12 +1,13 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
-    "composite": true,
+    "composite": false,
     "rootDir": "src",
     "outDir": "build",
     "tsBuildInfoFile": "build/.tsbuildinfo",
     "emitDeclarationOnly": true
   },
-  "include": ["src"],
-  "references": [{ "path": "../notion-types" }]
+  "include": [
+    "src/**/*"
+  ],
 }
diff --git a/packages/notion-utils/tsup.config.ts b/packages/notion-utils/tsup.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'tsup'
 export default defineConfig({
   entry: ['src/index.ts'],
   outDir: 'build',
+  dts: true,
   target: 'es2015',
   platform: 'browser',
   format: ['esm'],
diff --git a/packages/react-notion-x/package.json b/packages/react-notion-x/package.json
@@ -18,10 +18,11 @@
     "node": ">=12"
   },
   "scripts": {
-    "build": "tsup",
-    "dev": "npm run build -- --watch",
-    "watch": "tsup --watch --silent --onSuccess 'echo build successful'",
-    "types": "tsc --emitDeclarationOnly"
+    "build": "tsup --external react",
+    "clean": "rm -rf build",
+    "dev": "tsup --watch --external react",
+    "lint": "eslint '**/*.{ts,tsx}'",
+    "test": "ava"
   },
   "dependencies": {
     "@fisch0920/medium-zoom": "^1.0.7",
diff --git a/packages/react-notion-x/tsconfig.json b/packages/react-notion-x/tsconfig.json
@@ -1,16 +1,30 @@
 {
   "extends": "../../tsconfig.base",
   "compilerOptions": {
-    "composite": true,
-    "rootDir": "src",
+    // Tells TypeScript to read JS files, as
+    // normally they are ignored as source files
+    "allowJs": true,
+    // Generate d.ts files
+    "declaration": true,
+      // This compiler run should
+    // only output d.ts files
+    "emitDeclarationOnly": true,
+    // Types should go into this directory.
+    // Removing this would place the .d.ts files
+    // next to the .js files
     "outDir": "build",
+    // go to js file when using IDE functions like
+    // "Go to Definition" in VSCode
+    "declarationMap": true,
+    "composite": false,
+    "rootDir": "src",
     "tsBuildInfoFile": "build/.tsbuildinfo",
-    "emitDeclarationOnly": true,
     "lib": ["DOM", "ESNext"],
     "noImplicitReturns": false,
     "skipLibCheck": true,
     "jsx": "react"
   },
-  "include": ["src"],
-  "references": [{ "path": "../notion-types" }, { "path": "../notion-utils" }]
+  "include": [
+    "src/**/*"
+  ],
 }
diff --git a/packages/react-notion-x/tsup.config.ts b/packages/react-notion-x/tsup.config.ts
@@ -10,6 +10,7 @@ const baseConfig: Options = {
     'src/third-party/pdf.tsx'
   ],
   outDir: 'build',
+  dts: true,
   target: 'es2015',
   platform: 'browser',
   format: ['esm'],
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/turbo.json b/turbo.json
@@ -1,29 +1,31 @@
 {
-  "$schema": "https://turborepo.org/schema.json",
-  "baseBranch": "origin/master",
+  "$schema": "https://turbo.build/schema.json",
   "pipeline": {
     "build": {
-      "dependsOn": ["^build"],
-      "outputs": ["dist/**"]
+      "outputs": [
+        "dist/**",
+        ".next/**",
+        "!.next/cache/**",
+        "build/**",
+        "api/**",
+        "public/build/**"
+      ],
+      "dependsOn": ["^build"]
     },
     "test": {
-      "dependsOn": ["^build"],
-      "outputs": []
+      "outputs": ["coverage/**"],
+      "dependsOn": []
     },
     "lint": {
-      "outputs": []
-    },
-    "prettier-fix": {
-      "outputs": []
+      "dependsOn": ["^build"]
     },
     "dev": {
-      "cache": false
+      "dependsOn": ["^build"],
+      "cache": false,
+      "persistent": true
     },
-    "start": {
+    "clean": {
       "cache": false
-    },
-    "types": {
-      "outputs": ["dist/**/*.d.ts"]
     }
   }
 }
