From df1dfeaae3d85710c26436888fa0cbb234e09b80 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Sun, 16 Feb 2025 20:50:50 -0500 Subject: [PATCH] Set up dependencies --- visions/client/Taskfile.yml | 2 +- visions/client/package-lock.json | 18 ++++++++++++++++ visions/client/package.json | 3 +++ visions/client/src/lib.test.ts | 2 +- visions/client/src/lib.ts | 2 +- visions/types/Taskfile.yml | 3 +-- visions/types/package.json | 1 + visions/ui/package-lock.json | 35 +++++++++++++++++++++++++++++++- visions/ui/package.json | 4 +++- 9 files changed, 63 insertions(+), 7 deletions(-) diff --git a/visions/client/Taskfile.yml b/visions/client/Taskfile.yml index c9afb69..496d9d4 100644 --- a/visions/client/Taskfile.yml +++ b/visions/client/Taskfile.yml @@ -7,8 +7,8 @@ tasks: build: cmds: + - cd ../types && task build - npm install typescript - - typeshare --lang typescript --output-file gen/types.ts ../server/src - npx tsc test: diff --git a/visions/client/package-lock.json b/visions/client/package-lock.json index ec55daf..cffb9a7 100644 --- a/visions/client/package-lock.json +++ b/visions/client/package-lock.json @@ -8,6 +8,9 @@ "name": "visions-client", "version": "0.0.1", "license": "ISC", + "dependencies": { + "visions-types": "file:../types" + }, "devDependencies": { "@types/jest": "^29.5.14", "jest": "^29.7.0", @@ -16,6 +19,17 @@ "typescript": "^5.7.3" } }, + "../types": { + "name": "visions-types", + "version": "0.0.1", + "license": "ISC", + "dependencies": { + "typescript": "^5.7.3" + } + }, + "../types/dist/lib.ts": { + "extraneous": true + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -3466,6 +3480,10 @@ "node": ">=10.12.0" } }, + "node_modules/visions-types": { + "resolved": "../types", + "link": true + }, "node_modules/walker": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", diff --git a/visions/client/package.json b/visions/client/package.json index a747afe..953c1ac 100644 --- a/visions/client/package.json +++ b/visions/client/package.json @@ -19,5 +19,8 @@ "prettier": "^3.5.1", "ts-jest": "^29.2.5", "typescript": "^5.7.3" + }, + "dependencies": { + "visions-types": "file:../types" } } diff --git a/visions/client/src/lib.test.ts b/visions/client/src/lib.test.ts index ea3f7e7..a02f3a5 100644 --- a/visions/client/src/lib.test.ts +++ b/visions/client/src/lib.test.ts @@ -1,4 +1,4 @@ -import { Connection } from './client' +import { Connection } from './lib' describe('what happens in an authentication', () => { it('handles a successful response', async () => { diff --git a/visions/client/src/lib.ts b/visions/client/src/lib.ts index 85c7781..78d1bfd 100644 --- a/visions/client/src/lib.ts +++ b/visions/client/src/lib.ts @@ -1,4 +1,4 @@ -import { AuthResponse, SessionId, UserOverview } from '../gen/types' +import { AuthResponse, SessionId, UserOverview } from 'visions-types' export interface Client { auth: ( diff --git a/visions/types/Taskfile.yml b/visions/types/Taskfile.yml index bae02bb..92d55c6 100644 --- a/visions/types/Taskfile.yml +++ b/visions/types/Taskfile.yml @@ -4,5 +4,4 @@ tasks: build: cmds: - npm install typescript - - typeshare --lang typescript --output-file gen/lib.ts ../server/src - - npx tsc + - typeshare --lang typescript --output-file dist/lib.ts ../server/src diff --git a/visions/types/package.json b/visions/types/package.json index 6d972c1..afed36a 100644 --- a/visions/types/package.json +++ b/visions/types/package.json @@ -3,6 +3,7 @@ "version": "0.0.1", "description": "Shared data types for Visions", "main": "visions.js", + "types": "dist/lib.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/visions/ui/package-lock.json b/visions/ui/package-lock.json index 80f2255..8d39b24 100644 --- a/visions/ui/package-lock.json +++ b/visions/ui/package-lock.json @@ -9,7 +9,9 @@ "version": "0.0.0", "dependencies": { "react": "^19.0.0", - "react-dom": "^19.0.0" + "react-dom": "^19.0.0", + "visions-client": "file:../client", + "visions-types": "file:../types" }, "devDependencies": { "@eslint/js": "^9.19.0", @@ -30,6 +32,29 @@ "vite": "^6.1.0" } }, + "../client": { + "name": "visions-client", + "version": "0.0.1", + "license": "ISC", + "dependencies": { + "visions-types": "file:../types" + }, + "devDependencies": { + "@types/jest": "^29.5.14", + "jest": "^29.7.0", + "prettier": "^3.5.1", + "ts-jest": "^29.2.5", + "typescript": "^5.7.3" + } + }, + "../types": { + "name": "visions-types", + "version": "0.0.1", + "license": "ISC", + "dependencies": { + "typescript": "^5.7.3" + } + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -6678,6 +6703,14 @@ "node": ">=10.12.0" } }, + "node_modules/visions-client": { + "resolved": "../client", + "link": true + }, + "node_modules/visions-types": { + "resolved": "../types", + "link": true + }, "node_modules/vite": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz", diff --git a/visions/ui/package.json b/visions/ui/package.json index b50d2c7..a2b954c 100644 --- a/visions/ui/package.json +++ b/visions/ui/package.json @@ -13,7 +13,9 @@ }, "dependencies": { "react": "^19.0.0", - "react-dom": "^19.0.0" + "react-dom": "^19.0.0", + "visions-client": "file:../client", + "visions-types": "file:../types" }, "devDependencies": { "@eslint/js": "^9.19.0",