From 947522e752f73e2cd24b3e116c7aae5a532e2cff Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 31 Dec 2024 13:22:43 +0700 Subject: [PATCH] chore: simplify the build steps by reducing redundant yarn installs --- Makefile | 9 +++------ extensions/yarn.lock | 32 ++++++++++++++++---------------- package.json | 6 +++--- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index fde3b365a..0c2a2ef8a 100644 --- a/Makefile +++ b/Makefile @@ -18,18 +18,15 @@ config-yarn: yarn --version yarn config set -H enableImmutableInstalls false -# Builds the UI kit -build-joi: config-yarn - cd joi && yarn install && yarn build - # Installs yarn dependencies and builds core and extensions -install-and-build: build-joi +install-and-build: config-yarn ifeq ($(OS),Windows_NT) echo "skip" endif + yarn install + yarn build:joi yarn build:core yarn build:server - yarn install yarn build:extensions check-file-counts: install-and-build diff --git a/extensions/yarn.lock b/extensions/yarn.lock index e928181f3..920c08b36 100644 --- a/extensions/yarn.lock +++ b/extensions/yarn.lock @@ -509,7 +509,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Fassistant-extension%40workspace%3Aassistant-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -519,7 +519,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Fconversational-extension%40workspace%3Aconversational-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -529,7 +529,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Fengine-management-extension%40workspace%3Aengine-management-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -539,7 +539,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-anthropic-extension%40workspace%3Ainference-anthropic-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-anthropic-extension%40workspace%3Ainference-anthropic-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-anthropic-extension%40workspace%3Ainference-anthropic-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -549,7 +549,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-cohere-extension%40workspace%3Ainference-cohere-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-cohere-extension%40workspace%3Ainference-cohere-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-cohere-extension%40workspace%3Ainference-cohere-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -559,7 +559,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-cortex-extension%40workspace%3Ainference-cortex-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -569,7 +569,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-groq-extension%40workspace%3Ainference-groq-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-groq-extension%40workspace%3Ainference-groq-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-groq-extension%40workspace%3Ainference-groq-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -579,7 +579,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-martian-extension%40workspace%3Ainference-martian-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-martian-extension%40workspace%3Ainference-martian-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-martian-extension%40workspace%3Ainference-martian-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -589,7 +589,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-mistral-extension%40workspace%3Ainference-mistral-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-mistral-extension%40workspace%3Ainference-mistral-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-mistral-extension%40workspace%3Ainference-mistral-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -599,7 +599,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-nvidia-extension%40workspace%3Ainference-nvidia-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-nvidia-extension%40workspace%3Ainference-nvidia-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-nvidia-extension%40workspace%3Ainference-nvidia-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -609,7 +609,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-openai-extension%40workspace%3Ainference-openai-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-openai-extension%40workspace%3Ainference-openai-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-openai-extension%40workspace%3Ainference-openai-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -619,7 +619,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-openrouter-extension%40workspace%3Ainference-openrouter-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-openrouter-extension%40workspace%3Ainference-openrouter-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-openrouter-extension%40workspace%3Ainference-openrouter-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -629,7 +629,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Finference-triton-trt-llm-extension%40workspace%3Ainference-triton-trtllm-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Finference-triton-trt-llm-extension%40workspace%3Ainference-triton-trtllm-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Finference-triton-trt-llm-extension%40workspace%3Ainference-triton-trtllm-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -639,7 +639,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Fmodel-extension%40workspace%3Amodel-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -649,7 +649,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Fmonitoring-extension%40workspace%3Amonitoring-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Fmonitoring-extension%40workspace%3Amonitoring-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Fmonitoring-extension%40workspace%3Amonitoring-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" @@ -659,7 +659,7 @@ __metadata: "@janhq/core@file:../../core/package.tgz::locator=%40janhq%2Ftensorrt-llm-extension%40workspace%3Atensorrt-llm-extension": version: 0.1.10 - resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=e5ab56&locator=%40janhq%2Ftensorrt-llm-extension%40workspace%3Atensorrt-llm-extension" + resolution: "@janhq/core@file:../../core/package.tgz#../../core/package.tgz::hash=02e76a&locator=%40janhq%2Ftensorrt-llm-extension%40workspace%3Atensorrt-llm-extension" dependencies: rxjs: "npm:^7.8.1" ulidx: "npm:^2.3.0" diff --git a/package.json b/package.json index 62bc9fa09..174b39d96 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "dev:web": "yarn workspace @janhq/web dev", "dev:server": "yarn workspace @janhq/server dev", "dev": "concurrently -n \"NEXT,ELECTRON\" -c \"yellow,blue\" --kill-others \"yarn dev:web\" \"yarn dev:electron\"", - "build:server": "cd server && yarn install && yarn run build", - "build:core": "cd core && yarn install && yarn run build && yarn pack", + "build:server": "cd server && yarn build", + "build:core": "cd core && yarn build && yarn pack", "build:web": "yarn workspace @janhq/web build && cpx \"web/out/**\" \"electron/renderer/\"", "build:electron": "yarn copy:assets && yarn workspace jan build", "build:electron:test": "yarn workspace jan build:test", @@ -31,7 +31,7 @@ "build": "yarn build:web && yarn build:electron", "build:publish": "yarn copy:assets && yarn build:web && yarn workspace jan build:publish", "dev:joi": "yarn workspace @janhq/joi install && yarn workspace @janhq/joi dev", - "build:joi": "yarn workspace @janhq/joi install && yarn workspace @janhq/joi build", + "build:joi": "yarn workspace @janhq/joi build", "prepare": "husky" }, "devDependencies": {