Merge pull request #4468 from janhq/dev

release: Jan 0.5.14 release cut

Author: louis-jan

.github/scripts/rename-uninstaller.sh

@@ -18,6 +18,7 @@ if [ ! -f "$FILE_PATH" ]; then
 fi
 
 # Perform the replacements
+sed -i -e "s#Jan#Jan-$CHANNEL#g" "$FILE_PATH"
 sed -i -e "s#jan#jan-$CHANNEL#g" "$FILE_PATH"
 
 # Notify completion

.github/workflows/jan-electron-linter-and-test.yml

@@ -44,16 +44,17 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.base_ref }}
-      - name: Use Node.js v20.9.0
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: v20.9.0
+          node-version: 20
 
       - name: Install dependencies
         run: |
+          make config-yarn
           yarn
-          yarn build:core
           yarn build:joi
+          yarn build:core
 
       - name: Run test coverage
         run: yarn test:coverage
@@ -66,7 +67,7 @@ jobs:
 
   test-on-macos:
     if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-    runs-on: [self-hosted, macOS, macos-desktop]
+    runs-on: macos-latest
     steps:
       - name: Getting the repo
         uses: actions/checkout@v3
@@ -78,6 +79,10 @@ jobs:
         with:
           node-version: 20
 
+      - name: Set IS_TEST environment variable
+        run: |
+          echo "IS_TEST=true" >> $GITHUB_ENV
+
       - name: 'Cleanup cache'
         continue-on-error: true
         run: |
@@ -94,24 +99,19 @@ jobs:
         run: |
           echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}})" >> $GITHUB_ENV
 
-      - name: 'Config report portal'
-        run: |
-          make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App macos" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
+      # - name: 'Config report portal'
+      #   run: |
+      #     make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App macos" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
       - name: Linter and test
         run: |
-          npm config set registry ${{ secrets.NPM_PROXY }} --global
-          yarn config set registry ${{ secrets.NPM_PROXY }} --global
           make test
         env:
           CSC_IDENTITY_AUTO_DISCOVERY: 'false'
-          # TURBO_API: '${{ secrets.TURBO_API }}'
-          # TURBO_TEAM: 'macos'
-          # TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
 
   test-on-macos-pr-target:
     if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: [self-hosted, macOS, macos-desktop]
+    runs-on: macos-latest
     steps:
       - name: Getting the repo
         uses: actions/checkout@v3
@@ -131,8 +131,6 @@ jobs:
 
       - name: Linter and test
         run: |
-          npm config set registry https://registry.npmjs.org --global
-          yarn config set registry https://registry.npmjs.org --global
           make test
         env:
           CSC_IDENTITY_AUTO_DISCOVERY: 'false'
@@ -174,32 +172,27 @@ jobs:
         run: |
           echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV
 
-      - name: 'Config report portal'
-        shell: bash
-        run: |
-          make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows ${{ matrix.antivirus-tools }}" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
+      # - name: 'Config report portal'
+      #   shell: bash
+      #   run: |
+      #     make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows ${{ matrix.antivirus-tools }}" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
       - name: Linter and test
         shell: powershell
         run: |
-          npm config set registry ${{ secrets.NPM_PROXY }} --global
-          yarn config set registry ${{ secrets.NPM_PROXY }} --global
           make test
-        # env:
-        #   TURBO_API: '${{ secrets.TURBO_API }}'
-        #   TURBO_TEAM: 'windows'
-        #   TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
+
   test-on-windows-pr:
-    if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
-    runs-on: windows-desktop-default-windows-security
+    if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'workflow_dispatch'
+    runs-on: windows-latest
     steps:
       - name: Getting the repo
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Installing node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 20
 
@@ -222,25 +215,19 @@ jobs:
         run: |
           echo "REPORT_PORTAL_DESCRIPTION=${{github.event.after}}" >> $GITHUB_ENV
 
-      - name: 'Config report portal'
-        shell: bash
-        run: |
-          make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
+      # - name: 'Config report portal'
+      #   shell: bash
+      #   run: |
+      #     make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Windows" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
       - name: Linter and test
         shell: powershell
         run: |
-          npm config set registry ${{ secrets.NPM_PROXY }} --global
-          yarn config set registry ${{ secrets.NPM_PROXY }} --global
           make test
-        # env:
-        #   TURBO_API: '${{ secrets.TURBO_API }}'
-        #   TURBO_TEAM: 'windows'
-        #   TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
 
   test-on-windows-pr-target:
     if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: windows-desktop-default-windows-security
+    runs-on: windows-latest
     steps:
       - name: Getting the repo
         uses: actions/checkout@v3
@@ -268,12 +255,10 @@ jobs:
       - name: Linter and test
         shell: powershell
         run: |
-          npm config set registry https://registry.npmjs.org --global
-          yarn config set registry https://registry.npmjs.org --global
           make test
 
   test-on-ubuntu:
-    runs-on: [self-hosted, Linux, ubuntu-desktop]
+    runs-on: ubuntu-latest
     if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     steps:
       - name: Getting the repo
@@ -302,22 +287,16 @@ jobs:
         run: |
           echo "REPORT_PORTAL_DESCRIPTION=${{github.sha}}" >> $GITHUB_ENV
 
-      - name: 'Config report portal'
-        shell: bash
-        run: |
-          make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Linux" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
+      # - name: 'Config report portal'
+      #   shell: bash
+      #   run: |
+      #     make update-playwright-config REPORT_PORTAL_URL=${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_API_KEY=${{ secrets.REPORT_PORTAL_API_KEY }} REPORT_PORTAL_PROJECT_NAME=${{ secrets.REPORT_PORTAL_PROJECT_NAME }} REPORT_PORTAL_LAUNCH_NAME="Jan App Linux" REPORT_PORTAL_DESCRIPTION="${{env.REPORT_PORTAL_DESCRIPTION}}"
 
       - name: Linter and test
         run: |
           export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
           echo -e "Display ID: $DISPLAY"
-          npm config set registry ${{ secrets.NPM_PROXY }} --global
-          yarn config set registry ${{ secrets.NPM_PROXY }} --global
           make test
-        # env:
-        #   TURBO_API: '${{ secrets.TURBO_API }}'
-        #   TURBO_TEAM: 'linux'
-        #   TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
 
       - uses: actions/upload-artifact@v4
         if: always()
@@ -327,7 +306,7 @@ jobs:
           retention-days: 2
 
   coverage-check:
-    runs-on: [self-hosted, Linux, ubuntu-desktop]
+    runs-on: ubuntu-latest
     needs: base_branch_cov
     if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     steps:
@@ -341,6 +320,9 @@ jobs:
         with:
           node-version: 20
 
+      - name: Install yarn
+        run: npm install -g yarn
+
       - name: 'Cleanup cache'
         continue-on-error: true
         run: |
@@ -356,15 +338,9 @@ jobs:
         run: |
           export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
           echo -e "Display ID: $DISPLAY"
-          npm config set registry ${{ secrets.NPM_PROXY }} --global
-          yarn config set registry ${{ secrets.NPM_PROXY }} --global
           make lint
           yarn build:test
           yarn test:coverage
-        # env:
-        #   TURBO_API: '${{ secrets.TURBO_API }}'
-        #   TURBO_TEAM: 'linux'
-        #   TURBO_TOKEN: '${{ secrets.TURBO_TOKEN }}'
 
       - name: Generate Code Coverage report
         id: code-coverage
@@ -377,7 +353,7 @@ jobs:
           show-annotations: 'warning'
 
   test-on-ubuntu-pr-target:
-    runs-on: [self-hosted, Linux, ubuntu-desktop]
+    runs-on: ubuntu-latest
     if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
     steps:
       - name: Getting the repo
@@ -400,6 +376,4 @@ jobs:
         run: |
           export DISPLAY=$(w -h | awk 'NR==1 {print $2}')
           echo -e "Display ID: $DISPLAY"
-          npm config set registry https://registry.npmjs.org --global
-          yarn config set registry https://registry.npmjs.org --global
           make test

.github/workflows/publish-npm-core.yml

@@ -1,10 +1,10 @@
-name: Publish plugin models Package to npmjs
+name: Publish core Package to npmjs
 on:
   push:
     tags: ["v[0-9]+.[0-9]+.[0-9]+-core"]
-    paths: ["core/**"]
+    paths: ["core/**", ".github/workflows/publish-npm-core.yml"]
   pull_request:
-    paths: ["core/**"]
+    paths: ["core/**", ".github/workflows/publish-npm-core.yml"]
 jobs:
   build-and-publish-plugins:
     environment: production
@@ -45,7 +45,7 @@ jobs:
           node-version: "20.x"
           registry-url: "https://registry.npmjs.org"
 
-      - run: cd core && yarn install && yarn build
+      - run: cd core && corepack enable && corepack prepare [email protected] --activate && yarn --version && yarn config set -H enableImmutableInstalls false && yarn install && yarn build
 
       - run: cd core && yarn publish --access public
         if: github.event_name == 'push'

.github/workflows/publish-npm-joi.yml

@@ -1,10 +1,10 @@
-name: Publish plugin models Package to npmjs
+name: Publish joi Package to npmjs
 on:
   push:
     tags: ["v[0-9]+.[0-9]+.[0-9]+-joi"]
-    paths: ["joi/**"]
+    paths: ["joi/**", ".github/workflows/publish-npm-joi.yml"]
   pull_request:
-    paths: ["joi/**"]
+    paths: ["joi/**", ".github/workflows/publish-npm-joi.yml"]
 jobs:
   build-and-publish-plugins:
     environment: production
@@ -45,7 +45,7 @@ jobs:
           node-version: "20.x"
           registry-url: "https://registry.npmjs.org"
 
-      - run: cd joi && yarn install && yarn build
+      - run: cd joi && corepack enable && corepack prepare [email protected] --activate && yarn --version && yarn config set -H enableImmutableInstalls false && yarn install && yarn build
 
       - run: cd joi && yarn publish --access public
         if: github.event_name == 'push'

.gitignore

@@ -8,7 +8,6 @@ error.log
 node_modules
 *.tgz
 !charts/server/charts/*.tgz
-yarn.lock
 dist
 build
 .DS_Store
@@ -48,3 +47,7 @@ coverage
 test_results.html
 *.tsbuildinfo
 electron/shared/**
+
+# docs
+docs/yarn.lock
+electron/.version.bak

.yarnrc.yml

@@ -0,0 +1,3 @@
+nmHoistingLimits: workspaces
+nodeLinker: node-modules
+checksumBehavior: update

Makefile

@@ -10,23 +10,23 @@ REPORT_PORTAL_DESCRIPTION ?= "Jan App report"
 all:
 	@echo "Specify a target to run"
 
-# Builds the UI kit
-build-joi:
-ifeq ($(OS),Windows_NT)
-	cd joi && yarn config set network-timeout 300000 && yarn install && yarn build
-else
-	cd joi && yarn install && yarn build
-endif
+# Config yarn version
+
+config-yarn:
+	corepack enable
+	corepack prepare [email protected] --activate
+	yarn --version
+	yarn config set -H enableImmutableInstalls false
 
 # Installs yarn dependencies and builds core and extensions
-install-and-build: build-joi
+install-and-build: config-yarn
 ifeq ($(OS),Windows_NT)
-	yarn config set network-timeout 300000
+	echo "skip"
 endif
-	yarn global add [email protected]
+	yarn install
+	yarn build:joi
 	yarn build:core
 	yarn build:server
-	yarn install
 	yarn build:extensions
 
 check-file-counts: install-and-build
@@ -117,9 +117,8 @@ build: check-file-counts
 
 clean:
 ifeq ($(OS),Windows_NT)
-	-powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out, .turbo -Recurse -Directory | Remove-Item -Recurse -Force"
-	-powershell -Command "Get-ChildItem -Path . -Include package-lock.json -Recurse -File | Remove-Item -Recurse -Force"
-	-powershell -Command "Get-ChildItem -Path . -Include yarn.lock -Recurse -File | Remove-Item -Recurse -Force"
+	-powershell -Command "Get-ChildItem -Path . -Include node_modules, .next, dist, build, out, .turbo, .yarn -Recurse -Directory | Remove-Item -Recurse -Force"
+	-powershell -Command "Get-ChildItem -Path . -Include package-lock.json, tsconfig.tsbuildinfo -Recurse -File | Remove-Item -Recurse -Force"
 	-powershell -Command "Remove-Item -Recurse -Force ./pre-install/*.tgz"
 	-powershell -Command "Remove-Item -Recurse -Force ./extensions/*/*.tgz"
 	-powershell -Command "Remove-Item -Recurse -Force ./electron/pre-install/*.tgz"
@@ -131,8 +130,8 @@ else ifeq ($(shell uname -s),Linux)
 	find . -name "build" -type d -exec rm -rf '{}' +
 	find . -name "out" -type d -exec rm -rf '{}' +
 	find . -name ".turbo" -type d -exec rm -rf '{}' +
+	find . -name ".yarn" -type d -exec rm -rf '{}' +
 	find . -name "packake-lock.json" -type f -exec rm -rf '{}' +
-	find . -name "yarn.lock" -type f -exec rm -rf '{}' +
 	find . -name "package-lock.json" -type f -exec rm -rf '{}' +
 	rm -rf ./pre-install/*.tgz
 	rm -rf ./extensions/*/*.tgz
@@ -146,8 +145,8 @@ else
 	find . -name "build" -type d -exec rm -rf '{}' +
 	find . -name "out" -type d -exec rm -rf '{}' +
 	find . -name ".turbo" -type d -exec rm -rf '{}' +
+	find . -name ".yarn" -type d -exec rm -rf '{}' +
 	find . -name "package-lock.json" -type f -exec rm -rf '{}' +
-	find . -name "yarn.lock" -type f -exec rm -rf '{}' +
 	rm -rf ./pre-install/*.tgz
 	rm -rf ./extensions/*/*.tgz
 	rm -rf ./electron/pre-install/*.tgz

ai.menlo.jan.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Jan
+Comment=Local AI Assistant that runs 100% offline
+Exec=run.sh
+Icon=ai.menlo.jan
+Type=Application
+Categories=Development;
+Keywords=AI;Assistant;LLM;ChatGPT;Local;Offline;
+StartupNotify=true