diff --git a/.github/workflows/pr_checks.yaml b/.github/workflows/pr_checks.yaml index 04226c831..1acaedfac 100644 --- a/.github/workflows/pr_checks.yaml +++ b/.github/workflows/pr_checks.yaml @@ -175,11 +175,14 @@ jobs: path: gui/node_modules key: ${{ runner.os }}-gui-node-modules-${{ hashFiles('gui/package-lock.json') }} - - name: Build packages and install gui dependencies + - name: Build packages and install dependencies if: steps.gui-cache.outputs.cache-hit != 'true' run: | ./scripts/build-packages.sh - cd gui + + cd core + npm ci + cd ../gui npm ci gui-checks: @@ -206,10 +209,12 @@ jobs: path: gui/node_modules key: ${{ runner.os }}-gui-node-modules-${{ hashFiles('gui/package-lock.json') }} - - name: Build packages and install gui dependencies + - name: Build packages and install dependencies run: | ./scripts/build-packages.sh - cd gui + cd core + npm ci + cd ../gui npm ci - name: Type check and lint @@ -244,11 +249,13 @@ jobs: path: binary/node_modules key: ${{ runner.os }}-binary-node-modules-${{ hashFiles('binary/package-lock.json') }} - - name: Build packages and install binary dependencies + - name: Build packages and install dependencies if: steps.binary-cache.outputs.cache-hit != 'true' run: | ./scripts/build-packages.sh - cd binary + cd core + npm ci + cd ../binary npm ci - name: Type check @@ -285,11 +292,13 @@ jobs: path: extensions/vscode/node_modules key: ${{ runner.os }}-vscode-node-modules-${{ hashFiles('extensions/vscode/package-lock.json') }} - - name: Build packages and install vscode dependencies + - name: Build packages and install dependencies if: steps.vscode-cache.outputs.cache-hit != 'true' run: | ./scripts/build-packages.sh - cd extensions/vscode + cd core + npm ci + cd ../extensions/vscode npm ci env: GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }} @@ -320,10 +329,12 @@ jobs: path: extensions/vscode/node_modules key: ${{ runner.os }}-vscode-node-modules-${{ hashFiles('extensions/vscode/package-lock.json') }} - - name: Build packages and install vscode dependencies + - name: Build packages and install dependencies run: | ./scripts/build-packages.sh - cd extensions/vscode + cd core + npm ci + cd ../extensions/vscode npm ci env: GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }} @@ -441,7 +452,9 @@ jobs: id: vscode-get-test-file-matrix run: | ./scripts/build-packages.sh - cd extensions/vscode + cd core + npm ci + cd ../extensions/vscode npm ci npm run e2e:compile if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" || "${{ github.actor }}" == "dependabot[bot]" ]]; then @@ -512,7 +525,9 @@ jobs: if: steps.storage-cache.outputs.cache-hit != 'true' run: | ./scripts/build-packages.sh - cd extensions/vscode + cd core + npm ci + cd ../extensions/vscode npm run e2e:ci:download - name: Upload e2e dependencies @@ -570,8 +585,11 @@ jobs: name: vscode-e2e-dependencies path: extensions/vscode/e2e/storage - - name: Build packages - run: ./scripts/build-packages.sh + - name: Build packages and install core dependencies + run: | + ./scripts/build-packages.sh + cd core + npm ci - name: Fix VSCode binary permissions run: | @@ -655,10 +673,12 @@ jobs: path: core/node_modules key: ${{ runner.os }}-core-node-modules-${{ hashFiles('core/package-lock.json') }} - - name: Build packages and install GUI dependencies + - name: Build packages and install dependencies run: | ./scripts/build-packages.sh - cd gui + cd core + npm ci + cd ../gui npm ci env: GITHUB_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }} @@ -678,8 +698,11 @@ jobs: path: core/node_modules key: ${{ runner.os }}-core-node-modules-${{ hashFiles('core/package-lock.json') }} - - name: Build packages - run: ./scripts/build-packages.sh + - name: Build packages and install core dependencies + run: | + ./scripts/build-packages.sh + cd core + npm ci - name: Setup Java uses: actions/setup-java@v4.5.0 diff --git a/core/package-lock.json b/core/package-lock.json index 12f5c65df..a864be394 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -146,7 +146,7 @@ "version": "1.0.96", "license": "Apache-2.0", "dependencies": { - "@continuedev/config-types": "^1.0.14", + "@continuedev/config-types": "file:../config-types", "yaml": "^2.6.1", "zod": "^3.24.2" }, @@ -173,7 +173,7 @@ "version": "1.0.15", "license": "Apache-2.0", "dependencies": { - "@continuedev/config-types": "^1.0.5", + "@continuedev/config-types": "file:../config-types", "follow-redirects": "^1.15.6", "http-proxy-agent": "^7.0.2", "https-proxy-agent": "^7.0.5", @@ -181,6 +181,7 @@ }, "devDependencies": { "@types/follow-redirects": "^1.14.4", + "typescript": "^5.0.0", "vitest": "^3.2.0" } }, @@ -200,8 +201,8 @@ "dependencies": { "@aws-sdk/client-bedrock-runtime": "^3.842.0", "@aws-sdk/credential-providers": "^3.840.0", - "@continuedev/config-types": "^1.0.5", - "@continuedev/config-yaml": "^1.0.51", + "@continuedev/config-types": "file:../config-types", + "@continuedev/config-yaml": "file:../config-yaml", "@continuedev/fetch": "file:../fetch", "dotenv": "^16.5.0", "google-auth-library": "^10.1.0", diff --git a/extensions/vscode/package-lock.json b/extensions/vscode/package-lock.json index 8780ab1e2..188f8771c 100644 --- a/extensions/vscode/package-lock.json +++ b/extensions/vscode/package-lock.json @@ -1,16 +1,16 @@ { "name": "continue", - "version": "1.1.63", + "version": "1.1.67", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "continue", - "version": "1.1.63", + "version": "1.1.67", "license": "Apache-2.0", "dependencies": { "@continuedev/config-types": "^1.0.14", - "@continuedev/fetch": "^1.0.10", + "@continuedev/fetch": "file:../packages/fetch", "@electron/rebuild": "^3.2.10", "@reduxjs/toolkit": "^1.9.3", "@vscode/ripgrep": "^1.15.9", @@ -105,8 +105,8 @@ "@aws-sdk/credential-providers": "^3.778.0", "@continuedev/config-types": "^1.0.13", "@continuedev/config-yaml": "file:../packages/config-yaml", - "@continuedev/fetch": "^1.0.14", - "@continuedev/llm-info": "^1.0.8", + "@continuedev/fetch": "file:../packages/fetch", + "@continuedev/llm-info": "file:../packages/llm-info", "@continuedev/openai-adapters": "file:../packages/openai-adapters", "@modelcontextprotocol/sdk": "^1.12.0", "@mozilla/readability": "^0.5.0", @@ -129,6 +129,7 @@ "handlebars": "^4.7.8", "http-proxy-agent": "^7.0.1", "https-proxy-agent": "^7.0.3", + "iconv-lite": "^0.6.3", "ignore": "^5.3.1", "is-localhost-ip": "^2.0.0", "jinja-js": "0.1.8", @@ -142,7 +143,7 @@ "node-html-markdown": "^1.3.0", "ollama": "^0.4.6", "onnxruntime-node": "1.14.0", - "openai": "^4.76.0", + "openai": "^4.104.0", "p-limit": "^6.1.0", "partial-json": "^0.1.7", "pg": "^8.11.3", @@ -207,6 +208,7 @@ "node": ">=20.19.0" } }, + "../packages/fetch": {}, "node_modules/@75lb/deep-merge": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@75lb/deep-merge/-/deep-merge-1.1.2.tgz", @@ -710,17 +712,8 @@ } }, "node_modules/@continuedev/fetch": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/@continuedev/fetch/-/fetch-1.0.10.tgz", - "integrity": "sha512-RBUXtm/VDz+9Itgw+CxrHXwVXoHCAedGzPOgA7gS5HZ9lObaeCJgEfzmfbln1ocFsfqSFmn5X5wSE7DHgfxpVA==", - "license": "Apache-2.0", - "dependencies": { - "@continuedev/config-types": "^1.0.5", - "follow-redirects": "^1.15.6", - "http-proxy-agent": "^7.0.2", - "https-proxy-agent": "^7.0.5", - "node-fetch": "^3.3.2" - } + "resolved": "../packages/fetch", + "link": true }, "node_modules/@electron/node-gyp": { "version": "10.2.0-electron.1", diff --git a/gui/package-lock.json b/gui/package-lock.json index d611543e2..ce7be87e5 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -116,8 +116,8 @@ "@aws-sdk/credential-providers": "^3.778.0", "@continuedev/config-types": "^1.0.13", "@continuedev/config-yaml": "file:../packages/config-yaml", - "@continuedev/fetch": "^1.0.14", - "@continuedev/llm-info": "^1.0.8", + "@continuedev/fetch": "file:../packages/fetch", + "@continuedev/llm-info": "file:../packages/llm-info", "@continuedev/openai-adapters": "file:../packages/openai-adapters", "@modelcontextprotocol/sdk": "^1.12.0", "@mozilla/readability": "^0.5.0", @@ -140,6 +140,7 @@ "handlebars": "^4.7.8", "http-proxy-agent": "^7.0.1", "https-proxy-agent": "^7.0.3", + "iconv-lite": "^0.6.3", "ignore": "^5.3.1", "is-localhost-ip": "^2.0.0", "jinja-js": "0.1.8", @@ -153,7 +154,7 @@ "node-html-markdown": "^1.3.0", "ollama": "^0.4.6", "onnxruntime-node": "1.14.0", - "openai": "^4.76.0", + "openai": "^4.104.0", "p-limit": "^6.1.0", "partial-json": "^0.1.7", "pg": "^8.11.3", @@ -223,7 +224,7 @@ "version": "1.0.96", "license": "Apache-2.0", "dependencies": { - "@continuedev/config-types": "^1.0.14", + "@continuedev/config-types": "file:../config-types", "yaml": "^2.6.1", "zod": "^3.24.2" }, diff --git a/package-lock.json b/package-lock.json index 0a2538840..b4289d422 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "wt-openai-adapters-tests", + "name": "continue", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/scripts/install-dependencies.ps1 b/scripts/install-dependencies.ps1 index 4b0c2d9a9..bb957b090 100644 --- a/scripts/install-dependencies.ps1 +++ b/scripts/install-dependencies.ps1 @@ -76,27 +76,9 @@ if (($null -eq $node)) { Write-Host "`nInstalling root-level dependencies..." -ForegroundColor White npm install -Write-Host "`nBuilding config-types..." -ForegroundColor White -Push-Location packages/config-types -npm install -npm run build -Pop-Location - Write-Host "`nBuilding packages (fetch, openai-adapters, config-yaml)..." -ForegroundColor White & .\scripts\build-packages.ps1 -Write-Host "`nBuilding llm-info..." -ForegroundColor White -Push-Location packages/llm-info -npm install -npm run build -Pop-Location - -Write-Host "`nBuilding hub..." -ForegroundColor White -Push-Location packages/hub -npm install -npm run build -Pop-Location - Write-Host "`nInstalling Core extension dependencies..." -ForegroundColor White Push-Location core npm install diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh index 61d1887c2..294ce5628 100755 --- a/scripts/install-dependencies.sh +++ b/scripts/install-dependencies.sh @@ -30,27 +30,9 @@ fi echo "Installing root-level dependencies..." npm install -echo "Building config-types..." -pushd packages/config-types -npm install -npm run build -popd - echo "Building packages (fetch, openai-adapters, config-yaml)..." ./scripts/build-packages.sh -echo "Building llm-info..." -pushd packages/llm-info -npm install -npm run build -popd - -echo "Building hub..." -pushd packages/hub -npm install -npm run build -popd - echo "Installing Core extension dependencies..." pushd core ## This flag is set because we pull down Chromium at runtime