use turbo to manage dependencies when build

xiaoxinghu · xiaoxinghu · commit f3257ff5c236 · 2023-05-26T12:51:22.000+12:00
diff --git a/.editorconfig b/.editorconfig
@@ -9,7 +9,7 @@ insert_final_newline = true
 [vcbuild.bat]
 end_of_line = crlf
 
-[*.{js,cjs,mjs,jsx,ts,tsx,css,json}]
+[*.{js,cjs,mjs,jsx,ts,tsx,css,json,astro}]
 indent_style = space
 indent_size = 2
 
diff --git a/package.json b/package.json
@@ -24,8 +24,8 @@
     "typescript": "^5.0.4"
   },
   "scripts": {
-    "clean": "yarn workspaces foreach run clean",
-    "build": "tsc -b tsconfig.packages.json",
+    "clean": "turbo run clean --filter='./packages/*'",
+    "build": "turbo run build --filter='./packages/*'",
     "test": "turbo run test --filter='./packages/*'",
     "lint": "eslint packages --ext js,jsx,ts,tsx",
     "format": "prettier --write .",
diff --git a/packages/gatsby-transformer-orga/package.json b/packages/gatsby-transformer-orga/package.json
@@ -34,9 +34,8 @@
     "gatsby": "^3.0.0"
   },
   "scripts": {
-    "build": "pnpm clean && pnpm compile",
-    "clean": "del ./dist tsconfig.tsbuildinfo",
-    "compile": "tsc -b"
+    "clean": "tsc --build --clean",
+    "build": "tsc --build"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.12",
diff --git a/packages/gatsby-transformer-orga/tsconfig.json b/packages/gatsby-transformer-orga/tsconfig.json
@@ -4,6 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "references": [{ "path": "../orga-posts" }],
   "include": ["./src"]
 }
diff --git a/packages/loader/tests/loader.test.js b/packages/loader/tests/loader.test.js
@@ -18,7 +18,7 @@ test('basic org-mode parsing', async () => {
 /*@jsxRuntime automatic @jsxImportSource react*/
 import {jsx as _jsx, jsxs as _jsxs} from "react/jsx-runtime";
 export const title = 'hello world';
-function _createOrgaContent(props) {
+function _createOrgContent(props) {
   const _components = Object.assign({
     div: "div",
     h1: "h1"
@@ -35,13 +35,13 @@ function _createOrgaContent(props) {
     })]
   });
 }
-function OrgaContent(props = {}) {
-  const {wrapper: OrgaLayout} = props.components || ({});
-  return OrgaLayout ? _jsx(OrgaLayout, Object.assign({}, props, {
-    children: _jsx(_createOrgaContent, props)
-  })) : _createOrgaContent(props);
+function OrgContent(props = {}) {
+  const {wrapper: OrgLayout} = props.components || ({});
+  return OrgLayout ? _jsx(OrgLayout, Object.assign({}, props, {
+    children: _jsx(_createOrgContent, props)
+  })) : _createOrgContent(props);
 }
-export default OrgaContent;
+export default OrgContent;
 `.trim()
   )
 })
diff --git a/packages/next/tsconfig.json b/packages/next/tsconfig.json
@@ -4,10 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "references": [
-    { "path": "../rehype-estree" },
-    { "path": "../reorg-rehype" },
-    { "path": "../estree-jsx" }
-  ],
   "include": ["./src"]
 }
diff --git a/packages/oast-to-hast/tsconfig.json b/packages/oast-to-hast/tsconfig.json
@@ -4,6 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "references": [{ "path": "../orga" }],
   "include": ["./src"]
 }
diff --git a/packages/orga-posts/tsconfig.json b/packages/orga-posts/tsconfig.json
@@ -4,6 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "references": [{ "path": "../orga" }],
   "include": ["./src"]
 }
diff --git a/packages/orga/package.json b/packages/orga/package.json
@@ -15,10 +15,9 @@
     "directory": "packages/orga"
   },
   "scripts": {
-    "build": "pnpm clean && pnpm compile",
-    "clean": "del ./dist tsconfig.tsbuildinfo",
-    "test": "node --test --no-warnings --loader tsx src/**/*.test.ts",
-    "compile": "tsc -b"
+    "clean": "tsc --build --clean",
+    "build": "tsc --build",
+    "test": "node --test --no-warnings --loader tsx src/**/*.test.ts"
   },
   "dependencies": {
     "date-fns": "^2.30.0",
@@ -28,7 +27,6 @@
   "devDependencies": {
     "@types/node": "^20.2.1",
     "@types/unist": "^2.0.6",
-    "del-cli": "^5.0.0",
     "tsx": "^3.12.7",
     "typescript": "^5.0.4"
   }
diff --git a/packages/orga/tsconfig.json b/packages/orga/tsconfig.json
@@ -4,6 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "references": [{ "path": "../text-kit" }],
   "include": ["./src"]
 }
diff --git a/packages/orgx/package.json b/packages/orgx/package.json
@@ -11,7 +11,7 @@
     "directory": "packages/orgx"
   },
   "type": "module",
-  "main": "dist/index.js",
+  "main": "index.js",
   "types": "index.d.ts",
   "browser": {
     "./lib/condition.js": "./lib/condition.browser.js"
@@ -22,7 +22,8 @@
     "index.js"
   ],
   "scripts": {
-    "build": "tsc --build --clean && tsc --build",
+    "clean": "tsc --build --clean",
+    "build": "tsc --build",
     "test": "node --test tests/*.test.js"
   },
   "devDependencies": {
@@ -31,10 +32,8 @@
     "@types/hast": "^2.3.4",
     "@types/node": "^20.2.1",
     "@types/react": "^18.2.6",
-    "del-cli": "^5.0.0",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "tsx": "^3.12.7"
+    "react-dom": "^18.2.0"
   },
   "dependencies": {
     "@orgajs/reorg-parse": "workspace:^",
diff --git a/packages/orgx/tsconfig.json b/packages/orgx/tsconfig.json
@@ -1,6 +1,5 @@
 {
   "extends": "../../tsconfig.types.json",
   "include": ["lib/**/*.js", "index.js"],
-  "exclude": ["node_modules/", "src"],
-  "references": [{ "path": "../reorg-parse" }, { "path": "../reorg-rehype" }]
+  "exclude": ["node_modules/", "src"]
 }
diff --git a/packages/playground/src/index.tsx b/packages/playground/src/index.tsx
@@ -8,7 +8,7 @@ import { VFileMessage } from 'vfile-message'
 import { tokenizer } from './org-syntax'
 import codeTheme from './theme/light'
 import { useOrga } from './use-orga'
-import { RuntimeOptions } from '@orgajs/orgx'
+import { EvaluateOptions } from '@orgajs/orgx'
 
 const theme = {
   background: '#f5f8fa',
@@ -42,7 +42,7 @@ const treeTheme = {
 }
 
 interface Props {
-  runtime?: RuntimeOptions
+  runtime?: EvaluateOptions
   children: string
   onChange?: (text: string) => void
   style?: React.CSSProperties
diff --git a/packages/playground/src/use-orga.ts b/packages/playground/src/use-orga.ts
@@ -3,7 +3,7 @@ import { useState, useEffect, useCallback } from 'react'
 import { VFile } from 'vfile'
 import { VFileMessage } from 'vfile-message'
 import { tokenize } from 'orga'
-import { evaluate, RuntimeOptions } from '@orgajs/orgx'
+import { evaluate, EvaluateOptions } from '@orgajs/orgx'
 import latex from '@orgajs/rehype-latex'
 
 interface Output extends VFile {
@@ -12,7 +12,7 @@ interface Output extends VFile {
 
 export function useOrga(
   input: string,
-  runtime: RuntimeOptions = reactRuntime as RuntimeOptions
+  runtime: EvaluateOptions = reactRuntime as EvaluateOptions
 ): { output: Output } {
   const [output, setOutput] = useState<Output>(null)
 
@@ -29,9 +29,9 @@ export function useOrga(
       file.result = (
         await evaluate(file, {
           ...runtime,
-          reorgPlugins: [capture('oast')],
+          // reorgPlugins: [capture('oast')],
           rehypePlugins: [latex, capture('rehype')],
-          estreePlugins: [capture('estree')],
+          recmaPlugins: [capture('estree')],
         })
       ).default
       capture('jsx')()(String(file))
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -11,7 +11,8 @@
     "index.js"
   ],
   "scripts": {
-    "build": "tsc --build --clean && tsc --build"
+    "clean": "tsc --build --clean",
+    "build": "tsc --build"
   },
   "peerDependencies": {
     "react": ">=16"
@@ -22,7 +23,6 @@
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
     "babel-plugin-remove-export-keywords": "^1.6.22",
-    "del-cli": "^5.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json
@@ -1,6 +1,5 @@
 {
   "extends": "../../tsconfig.types.json",
   "include": ["lib/**/*.js", "index.js"],
-  "exclude": ["node_modules/"],
-  "references": [{ "path": "../orgx" }]
+  "exclude": ["node_modules/"]
 }
diff --git a/packages/reorg-parse/package.json b/packages/reorg-parse/package.json
@@ -16,15 +16,13 @@
     "directory": "packages/reorg-parse"
   },
   "scripts": {
-    "build": "pnpm clean && pnpm compile",
-    "clean": "del ./dist tsconfig.tsbuildinfo",
-    "compile": "tsc -b"
+    "clean": "tsc --build --clean",
+    "build": "tsc --build"
   },
   "dependencies": {
     "orga": "workspace:^"
   },
   "devDependencies": {
-    "del-cli": "^5.0.0",
     "typescript": "^5.0.4",
     "unified": "^10.1.2"
   }
diff --git a/packages/reorg-parse/tsconfig.json b/packages/reorg-parse/tsconfig.json
@@ -4,6 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "references": [{ "path": "../orga" }],
   "include": ["./src"]
 }
diff --git a/packages/reorg-rehype/tsconfig.json b/packages/reorg-rehype/tsconfig.json
@@ -4,6 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "references": [{ "path": "../oast-to-hast" }],
   "include": ["./src"]
 }
diff --git a/packages/reorg/tsconfig.json b/packages/reorg/tsconfig.json
@@ -4,6 +4,5 @@
     "rootDir": "./src",
     "outDir": "./dist"
   },
-  "references": [{ "path": "../reorg-parse" }],
   "include": ["./src"]
 }
diff --git a/packages/rollup/package.json b/packages/rollup/package.json
@@ -21,26 +21,13 @@
     "build": "tsc -b",
     "test": "node --test test.js"
   },
-  "ava": {
-    "typescript": {
-      "extensions": [
-        "ts",
-        "tsx"
-      ],
-      "rewritePaths": {
-        "src/": "dist/"
-      },
-      "compile": "tsc"
-    }
-  },
   "devDependencies": {
     "@types/node": "^20.2.1",
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rollup": "^3.22.0",
-    "typescript": "^5.0.4"
+    "rollup": "^3.22.0"
   },
   "peerDependencies": {
     "rollup": ">=2"
diff --git a/packages/rollup/tsconfig.json b/packages/rollup/tsconfig.json
@@ -1,6 +1,5 @@
 {
   "extends": "../../tsconfig.types.json",
   "include": ["index.js"],
-  "exclude": ["coverage/", "node_modules/"],
-  "references": [{ "path": "../orgx" }]
+  "exclude": ["node_modules/"]
 }
diff --git a/packages/text-kit/package.json b/packages/text-kit/package.json
@@ -19,17 +19,15 @@
     "dist"
   ],
   "scripts": {
-    "build": "pnpm clean && pnpm compile",
-    "clean": "del ./dist tsconfig.tsbuildinfo",
-    "test": "node --test --no-warnings --loader tsx src/**/*.test.ts",
-    "compile": "tsc -b"
+    "clean": "tsc --build --clean",
+    "build": "tsc --build",
+    "test": "node --test --no-warnings --loader tsx src/**/*.test.ts"
   },
   "bugs": {
     "url": "https://github.com/orgapp/orgajs/issues"
   },
   "devDependencies": {
     "@types/unist": "2.0.6",
-    "del-cli": "^5.0.0",
     "tsx": "^3.12.7",
     "typescript": "^5.0.4"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
diff --git a/tsconfig.types.json b/tsconfig.types.json
diff --git a/turbo.json b/turbo.json

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,5 @@`
`4`	`4`	`"rootDir": "./src",`
`5`	`5`	`"outDir": "./dist"`
`6`	`6`	`},`
`7`		`- "references": [{ "path": "../orga-posts" }],`
`8`	`7`	`"include": ["./src"]`
`9`	`8`	`}`