History

build fixes

Rhys Sullivan committed 9 months ago

Commit cdf99c11 parent 1f163db4 files · +44 −59Browse files

Unified · Split

4 files
  1. bun.lock +20 −24
  2. executor/apps/web/next.config.ts +1 −1
  3. executor/package.json +0 −30
  4. package.json +23 −4
bun.lock+20−24
@@ -4,6 +4,21 @@ · 3 unmodified lines
44 "workspaces": {
55 "": {
66 "name": "proto-monorepo",
7+ "dependencies": {
8+ "@convex-dev/stripe": "^0.1.3",
9+ "@convex-dev/workos-authkit": "^0.1.6",
10+ "@executor/contracts": "workspace:*",
11+ "@workos-inc/node": "^8.2.0",
12+ "convex": "^1.31.7",
13+ "convex-helpers": "^0.1.111",
14+ "jose": "^6.1.0",
15+ },
16+ "devDependencies": {
17+ "@modelcontextprotocol/sdk": "^1.26.0",
18+ "@types/bun": "latest",
19+ "convex-test": "^0.0.41",
20+ "typescript": "latest",
21+ },
722 },
823 "assistant": {
924 "name": "assistant-monorepo",
@@ -66,23 +81,6 @@ · 56 unmodified lines
6681 "@types/bun": "latest",
6782 },
6883 },
69− "executor": {
70− "name": "executor-monorepo",
71− "dependencies": {
72− "@convex-dev/stripe": "^0.1.3",
73− "@convex-dev/workos-authkit": "^0.1.6",
74− "@workos-inc/node": "^8.2.0",
75− "convex": "^1.31.7",
76− "convex-helpers": "^0.1.111",
77− "jose": "^6.1.0",
78− },
79− "devDependencies": {
80− "@modelcontextprotocol/sdk": "^1.26.0",
81− "@types/bun": "latest",
82− "convex-test": "^0.0.41",
83− "typescript": "latest",
84− },
85− },
8684 "executor/apps/web": {
8785 "name": "@executor/web",
8886 "version": "0.1.0",
@@ -1070,11 +1068,11 @@ · 981 unmodified lines
10701068
10711069 "@vladfrangu/async_event_emitter": ["@vladfrangu/async_event_emitter@2.4.7", "", {}, "sha512-Xfe6rpCTxSxfbswi/W/Pz7zp1WWSNn4A0eW4mLkQUewCrXXtMj31lCg+iQyTkh/CkusZSq9eDflu7tjEDXUY6g=="],
10721070
1073− "@workos-inc/authkit-js": ["@workos-inc/authkit-js@0.13.0", "", {}, "sha512-iA0Dt7D1BmY2/1s4oeA36W/aRt8/b5iyH6rP4AlgnjrcH2lUGkBgDXL76NXc0M7repkDQTMcJJ2NhCSo2rcWmg=="],
1071+ "@workos-inc/authkit-js": ["@workos-inc/authkit-js@0.14.0", "", {}, "sha512-Wt6rKoZdZnuAgiEBlvMDKhleU9DAwpyyy1SibacrnOWQgF4rcNlC+NTnHiiXu6OiOjQo6pPxhW42kCL+Gi+fjw=="],
10741072
10751073 "@workos-inc/authkit-nextjs": ["@workos-inc/authkit-nextjs@2.13.0", "", { "dependencies": { "@workos-inc/node": "^7.72.0", "iron-session": "^8.0.1", "jose": "^5.2.3", "path-to-regexp": "^6.2.2" }, "peerDependencies": { "next": "^13.5.9 || ^14.2.26 || ^15.2.3 || ^16", "react": "^18.0 || ^19.0.0", "react-dom": "^18.0 || ^19.0.0" } }, "sha512-ppxzhfakPumHPPggYSROaAlgxfS7viFMPmWPG76Tp6Rh9G7YqkBSp7xtvMtM6gXOFFMvvEJRcKEta6YHeercTQ=="],
10761074
1077− "@workos-inc/authkit-react": ["@workos-inc/authkit-react@0.11.0", "", { "dependencies": { "@workos-inc/authkit-js": "0.13.0" }, "peerDependencies": { "react": ">=17" } }, "sha512-67HFSxP4wXC8ECGyvc1yGMwuD5NGkwT2OPt8DavHoKAlO+hRaAlu9wwzqUx1EJrHht0Dcx+l20Byq8Ab0bEhlg=="],
1075+ "@workos-inc/authkit-react": ["@workos-inc/authkit-react@0.13.0", "", { "dependencies": { "@workos-inc/authkit-js": "0.14.0" }, "peerDependencies": { "react": ">=17" } }, "sha512-JhcPI9+I0MGOu7B33Gych76Xi7jKfKKfoZ4Mb6JPY9raeEqJQcnN4jMite2ynmMdmiZljIq7wkyf2WAsEU3SzQ=="],
10781076
10791077 "@workos-inc/node": ["@workos-inc/node@8.2.0", "", { "dependencies": { "iron-webcrypto": "^2.0.0", "jose": "~6.1.0" } }, "sha512-aAY2k7X09lQ4TaVe7Kjm3gjb+EsGRoncbwJCOou9mCmunQoEYO1lsNrJTRIMM+jKCPBQDcmMF1O3Bv8IQwQKtg=="],
10801078
@@ -1396,8 +1394,6 @@ · 315 unmodified lines
13961394
13971395 "execa": ["execa@9.6.1", "", { "dependencies": { "@sindresorhus/merge-streams": "^4.0.0", "cross-spawn": "^7.0.6", "figures": "^6.1.0", "get-stream": "^9.0.0", "human-signals": "^8.0.1", "is-plain-obj": "^4.1.0", "is-stream": "^4.0.1", "npm-run-path": "^6.0.0", "pretty-ms": "^9.2.0", "signal-exit": "^4.1.0", "strip-final-newline": "^4.0.0", "yoctocolors": "^2.1.1" } }, "sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA=="],
13981396
1399− "executor-monorepo": ["executor-monorepo@workspace:executor"],
1400−
14011397 "expect-type": ["expect-type@1.3.0", "", {}, "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA=="],
14021398
14031399 "express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="],
@@ -2292,7 +2288,7 @@ · 888 unmodified lines
22922288
22932289 "@babel/helper-compilation-targets/lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="],
22942290
2295− "@convex-dev/workos-authkit/@workos-inc/authkit-react": ["@workos-inc/authkit-react@0.13.0", "", { "dependencies": { "@workos-inc/authkit-js": "0.14.0" }, "peerDependencies": { "react": ">=17" } }, "sha512-JhcPI9+I0MGOu7B33Gych76Xi7jKfKKfoZ4Mb6JPY9raeEqJQcnN4jMite2ynmMdmiZljIq7wkyf2WAsEU3SzQ=="],
2291+ "@convex-dev/workos/@workos-inc/authkit-react": ["@workos-inc/authkit-react@0.11.0", "", { "dependencies": { "@workos-inc/authkit-js": "0.13.0" }, "peerDependencies": { "react": ">=17" } }, "sha512-67HFSxP4wXC8ECGyvc1yGMwuD5NGkwT2OPt8DavHoKAlO+hRaAlu9wwzqUx1EJrHht0Dcx+l20Byq8Ab0bEhlg=="],
22962292
22972293 "@convex-dev/workos-authkit/@workos-inc/node": ["@workos-inc/node@7.82.0", "", { "dependencies": { "iron-session": "~6.3.1", "jose": "~5.6.3", "leb": "^1.0.0", "qs": "6.14.1" } }, "sha512-8h6XjIJf8nqNGYQMkWsjZ72WXMtzqrb4Azz39schXWoSRmwoK6tK+GpeAviJ9slddiJdOcp0Ht9/r+L6pGQMCg=="],
22982294
@@ -2436,12 +2432,12 @@ · 137 unmodified lines
24362432
24372433 "@aws-crypto/util/@smithy/util-utf8/@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="],
24382434
2439− "@convex-dev/workos-authkit/@workos-inc/authkit-react/@workos-inc/authkit-js": ["@workos-inc/authkit-js@0.14.0", "", {}, "sha512-Wt6rKoZdZnuAgiEBlvMDKhleU9DAwpyyy1SibacrnOWQgF4rcNlC+NTnHiiXu6OiOjQo6pPxhW42kCL+Gi+fjw=="],
2440−
24412435 "@convex-dev/workos-authkit/@workos-inc/node/iron-session": ["iron-session@6.3.1", "", { "dependencies": { "@peculiar/webcrypto": "^1.4.0", "@types/cookie": "^0.5.1", "@types/express": "^4.17.13", "@types/koa": "^2.13.5", "@types/node": "^17.0.41", "cookie": "^0.5.0", "iron-webcrypto": "^0.2.5" }, "peerDependencies": { "express": ">=4", "koa": ">=2", "next": ">=10" }, "optionalPeers": ["express", "koa", "next"] }, "sha512-3UJ7y2vk/WomAtEySmPgM6qtYF1cZ3tXuWX5GsVX4PJXAcs5y/sV9HuSfpjKS6HkTL/OhZcTDWJNLZ7w+Erx3A=="],
24422436
24432437 "@convex-dev/workos-authkit/@workos-inc/node/jose": ["jose@5.6.3", "", {}, "sha512-1Jh//hEEwMhNYPDDLwXHa2ePWgWiFNNUadVmguAAw2IJ6sj9mNxV5tGXJNqlMkJAybF6Lgw1mISDxTePP/187g=="],
24442438
2439+ "@convex-dev/workos/@workos-inc/authkit-react/@workos-inc/authkit-js": ["@workos-inc/authkit-js@0.13.0", "", {}, "sha512-iA0Dt7D1BmY2/1s4oeA36W/aRt8/b5iyH6rP4AlgnjrcH2lUGkBgDXL76NXc0M7repkDQTMcJJ2NhCSo2rcWmg=="],
2440+
24452441 "@dotenvx/dotenvx/execa/get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="],
24462442
24472443 "@dotenvx/dotenvx/execa/human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="],
executor/apps/web/next.config.ts+1−1
@@ -2,7 +2,7 @@ import type { NextConfig } from "next"; · 1 unmodified line
22 import path from "node:path";
33 import { fileURLToPath } from "node:url";
44
5−const workspaceRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
5+const workspaceRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "..", "..");
66
77 const nextConfig: NextConfig = {
88 turbopack: {
executor/package.json+0−30
@@ -1,30 +0,0 @@
1−{
2− "name": "executor-monorepo",
3− "private": true,
4− "type": "module",
5− "scripts": {
6− "dev": "bun run dev:convex",
7− "dev:convex": "bunx convex dev",
8− "db:clear": "bun run wipe-convex-db.ts",
9− "dev:web": "bun run --cwd apps/web dev",
10− "dev:all": "bun run dev:convex & bun run dev:web",
11− "start": "bun run dev:convex",
12− "convex:codegen": "bunx convex codegen",
13− "test": "bun test",
14− "typecheck": "bunx tsc --noEmit -p tsconfig.json"
15− },
16− "dependencies": {
17− "@convex-dev/stripe": "^0.1.3",
18− "@convex-dev/workos-authkit": "^0.1.6",
19− "@workos-inc/node": "^8.2.0",
20− "convex": "^1.31.7",
21− "convex-helpers": "^0.1.111",
22− "jose": "^6.1.0"
23− },
24− "devDependencies": {
25− "@modelcontextprotocol/sdk": "^1.26.0",
26− "@types/bun": "latest",
27− "convex-test": "^0.0.41",
28− "typescript": "latest"
29− }
30−}
package.json+23−4
@@ -3,7 +3,6 @@ · 2 unmodified lines
33 "private": true,
44 "type": "module",
55 "workspaces": [
6− "executor",
76 "executor/apps/*",
87 "executor/packages/*",
98 "assistant",
@@ -12,12 +11,32 @@ · 2 unmodified lines
1211 ],
1312 "scripts": {
1413 "dev": "bun run dev.ts",
15− "dev:executor": "bun run --cwd executor dev",
14+ "dev:executor": "bun run dev:executor:convex",
15+ "dev:executor:convex": "bunx --cwd executor convex dev",
16+ "dev:executor:web": "bun run --cwd executor/apps/web dev",
17+ "dev:executor:all": "bun run dev:executor:convex & bun run dev:executor:web",
1618 "dev:assistant": "bun run --cwd assistant dev:server",
1719 "dev:bot": "bun run --cwd assistant dev:bot",
1820 "test": "bun run test:executor && bun run test:assistant",
19− "test:executor": "bun run --cwd executor test",
21+ "test:executor": "bun test --cwd executor",
2022 "test:assistant": "bun run --cwd assistant test",
21− "typecheck:executor": "bun run --cwd executor typecheck"
23+ "typecheck:executor": "bunx tsc --noEmit -p executor/tsconfig.json",
24+ "db:clear:executor": "bun run executor/wipe-convex-db.ts",
25+ "convex:codegen": "bunx --cwd executor convex codegen"
26+ },
27+ "dependencies": {
28+ "@convex-dev/stripe": "^0.1.3",
29+ "@convex-dev/workos-authkit": "^0.1.6",
30+ "@executor/contracts": "workspace:*",
31+ "@workos-inc/node": "^8.2.0",
32+ "convex": "^1.31.7",
33+ "convex-helpers": "^0.1.111",
34+ "jose": "^6.1.0"
35+ },
36+ "devDependencies": {
37+ "@modelcontextprotocol/sdk": "^1.26.0",
38+ "@types/bun": "latest",
39+ "convex-test": "^0.0.41",
40+ "typescript": "latest"
2241 }
2342 }