diff --git a/apps/roam/package.json b/apps/roam/package.json index be75acec1..3b729fc7b 100644 --- a/apps/roam/package.json +++ b/apps/roam/package.json @@ -33,7 +33,7 @@ "@repo/types": "*", "@supabase/auth-js": "^2.71.1", "@supabase/supabase-js": "^2.52.0", - "@tldraw/tldraw": "^2.0.0-alpha.12", + "@tldraw/tldraw": "2.0.0-canary.ffda4cfb", "@vercel/blob": "^0.27.0", "contrast-color": "^1.0.1", "cytoscape-navigator": "^2.0.1", @@ -43,13 +43,7 @@ "react-draggable": "^4.4.5", "react-in-viewport": "^1.0.0-alpha.20", "react-vertical-timeline-component": "^3.5.2", - "roamjs-components": "^0.85.1", + "roamjs-components": "^0.85.3", "signia-react": "^0.1.1" - }, - "overrides": { - "@tldraw/tldraw": { - "react": "^17.0.2", - "react-dom": "^17.0.2" - } } } diff --git a/package-lock.json b/package-lock.json index 07d0a9a17..90cade833 100644 --- a/package-lock.json +++ b/package-lock.json @@ -515,7 +515,7 @@ "@repo/types": "*", "@supabase/auth-js": "^2.71.1", "@supabase/supabase-js": "^2.52.0", - "@tldraw/tldraw": "^2.0.0-alpha.12", + "@tldraw/tldraw": "2.0.0-canary.ffda4cfb", "@vercel/blob": "^0.27.0", "contrast-color": "^1.0.1", "cytoscape-navigator": "^2.0.1", @@ -525,7 +525,7 @@ "react-draggable": "^4.4.5", "react-in-viewport": "^1.0.0-alpha.20", "react-vertical-timeline-component": "^3.5.2", - "roamjs-components": "^0.85.1", + "roamjs-components": "^0.85.3", "signia-react": "^0.1.1" }, "devDependencies": { @@ -4089,34 +4089,6 @@ "license": "MIT", "peer": true }, - "apps/roam/node_modules/aws-sdk": { - "version": "2.1359.0", - "license": "Apache-2.0", - "dependencies": { - "buffer": "4.9.2", - "events": "1.1.1", - "ieee754": "1.1.13", - "jmespath": "0.16.0", - "querystring": "0.2.0", - "sax": "1.2.1", - "url": "0.10.3", - "util": "^0.12.4", - "uuid": "8.0.0", - "xml2js": "0.5.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "apps/roam/node_modules/aws-sdk-plus": { - "version": "0.5.3", - "license": "MIT", - "dependencies": { - "aws-sdk": "^2.1004.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" - } - }, "apps/roam/node_modules/axios": { "version": "0.27.2", "license": "MIT", @@ -4143,15 +4115,6 @@ "version": "0.31.2", "license": "Apache-2.0" }, - "apps/roam/node_modules/buffer": { - "version": "4.9.2", - "license": "MIT", - "dependencies": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, "apps/roam/node_modules/c8": { "version": "7.14.0", "license": "ISC", @@ -4674,13 +4637,6 @@ "version": "4.0.7", "license": "MIT" }, - "apps/roam/node_modules/events": { - "version": "1.1.1", - "license": "MIT", - "engines": { - "node": ">=0.4.x" - } - }, "apps/roam/node_modules/execa": { "version": "1.0.0", "license": "MIT", @@ -5009,10 +4965,6 @@ "license": "ISC", "peer": true }, - "apps/roam/node_modules/ieee754": { - "version": "1.1.13", - "license": "BSD-3-Clause" - }, "apps/roam/node_modules/insect": { "version": "5.7.0", "license": "MIT", @@ -5078,6 +5030,7 @@ "apps/roam/node_modules/is-arguments": { "version": "1.1.1", "license": "MIT", + "peer": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -5137,7 +5090,8 @@ }, "apps/roam/node_modules/isarray": { "version": "1.0.0", - "license": "MIT" + "license": "MIT", + "peer": true }, "apps/roam/node_modules/istanbul-lib-coverage": { "version": "3.2.0", @@ -5172,13 +5126,6 @@ "node": ">=8" } }, - "apps/roam/node_modules/jmespath": { - "version": "0.16.0", - "license": "Apache-2.0", - "engines": { - "node": ">= 0.6.0" - } - }, "apps/roam/node_modules/jquery": { "version": "3.6.3", "license": "MIT", @@ -5635,12 +5582,6 @@ "once": "^1.3.1" } }, - "apps/roam/node_modules/querystring": { - "version": "0.2.0", - "engines": { - "node": ">=0.4.x" - } - }, "apps/roam/node_modules/querystringify": { "version": "2.2.0", "license": "MIT", @@ -5699,6 +5640,7 @@ "apps/roam/node_modules/react-dom": { "version": "17.0.2", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", @@ -5961,14 +5903,13 @@ } }, "apps/roam/node_modules/roamjs-components": { - "version": "0.85.1", - "resolved": "https://registry.npmjs.org/roamjs-components/-/roamjs-components-0.85.1.tgz", - "integrity": "sha512-2Ok6DR1QcvXloKFO+8NRAB33rMciRjwpROMEiwctfjrJ2K4k+nPb41bzvgR1252eaM73oubJuLNeyXyt6wBmYA==", + "version": "0.85.3", + "resolved": "https://registry.npmjs.org/roamjs-components/-/roamjs-components-0.85.3.tgz", + "integrity": "sha512-ATCB41cswz0WwcLBarH1HZCKmE7mkqDfqD1ANA+c5Hy645bNE8TmjbHCi8PJVwY8CdoY/aJCqq5AeDXM/iS+Fg==", "hasInstallScript": true, "license": "MIT", "dependencies": { "@samepage/scripts": "^0.74.2", - "aws-sdk-plus": "^0.5.3", "color": "^4.0.1", "date-fns": "^2.27.0", "edn-data": "^1.0.0", @@ -6019,10 +5960,6 @@ "license": "MIT", "peer": true }, - "apps/roam/node_modules/sax": { - "version": "1.2.1", - "license": "ISC" - }, "apps/roam/node_modules/saxes": { "version": "6.0.0", "license": "ISC", @@ -6037,6 +5974,7 @@ "apps/roam/node_modules/scheduler": { "version": "0.20.2", "license": "MIT", + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -6282,14 +6220,6 @@ "node": ">= 4.0.0" } }, - "apps/roam/node_modules/url": { - "version": "0.10.3", - "license": "MIT", - "dependencies": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, "apps/roam/node_modules/url-parse": { "version": "1.5.10", "license": "MIT", @@ -6299,10 +6229,6 @@ "requires-port": "^1.0.0" } }, - "apps/roam/node_modules/url/node_modules/punycode": { - "version": "1.3.2", - "license": "MIT" - }, "apps/roam/node_modules/use-callback-ref": { "version": "1.3.0", "license": "MIT", @@ -6362,24 +6288,6 @@ "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, - "apps/roam/node_modules/util": { - "version": "0.12.5", - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "is-arguments": "^1.0.4", - "is-generator-function": "^1.0.7", - "is-typed-array": "^1.1.3", - "which-typed-array": "^1.1.2" - } - }, - "apps/roam/node_modules/uuid": { - "version": "8.0.0", - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "apps/roam/node_modules/v8-to-istanbul": { "version": "9.1.0", "license": "ISC", @@ -6493,24 +6401,6 @@ "node": ">=12" } }, - "apps/roam/node_modules/xml2js": { - "version": "0.5.0", - "license": "MIT", - "dependencies": { - "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "apps/roam/node_modules/xmlbuilder": { - "version": "11.0.1", - "license": "MIT", - "engines": { - "node": ">=4.0" - } - }, "apps/roam/node_modules/xmlchars": { "version": "2.2.0", "license": "MIT", @@ -16239,6 +16129,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" @@ -16476,6 +16367,7 @@ "version": "1.1.13", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "dev": true, "license": "MIT", "dependencies": { "which-typed-array": "^1.1.14" diff --git a/package.json b/package.json index cc2814d6a..c3717d299 100644 --- a/package.json +++ b/package.json @@ -31,5 +31,24 @@ }, "dependencies": { "posthog-js": "^1.203.1" + }, + "//": "Roam Research still uses React 18", + "overrides": { + "@blueprintjs/core": { + "react": "18.2.0", + "react-dom": "18.2.0" + }, + "@blueprintjs/datetime": { + "react": "18.2.0", + "react-dom": "18.2.0" + }, + "@blueprintjs/select": { + "react": "18.2.0", + "react-dom": "18.2.0" + }, + "roamjs-components": { + "react": "18.2.0", + "react-dom": "18.2.0" + } } }