From e8e8821134ef15043b92de83a31fa203640f6d70 Mon Sep 17 00:00:00 2001 From: uinstinct <61635505+uinstinct@users.noreply.github.com> Date: Fri, 6 Jun 2025 22:58:45 +0530 Subject: [PATCH] move install-copy-nodemodule to vscode scripts --- binary/build.js | 6 ++++-- extensions/vscode/package-lock.json | 4 ++-- .../vscode/scripts/install-copy-nodemodule.js | 12 +++++++----- extensions/vscode/scripts/prepackage.js | 6 +++--- package-lock.json | 11 ----------- package.json | 1 - 6 files changed, 16 insertions(+), 24 deletions(-) rename scripts/util/copy-nodemodule.js => extensions/vscode/scripts/install-copy-nodemodule.js (92%) diff --git a/binary/build.js b/binary/build.js index aa5fa5ffd..56c27b2bd 100644 --- a/binary/build.js +++ b/binary/build.js @@ -6,7 +6,9 @@ const { rimrafSync } = require("rimraf"); const { validateFilesPresent } = require("../scripts/util"); const { ALL_TARGETS, TARGET_TO_LANCEDB } = require("./utils/targets"); const { fork } = require("child_process"); -const { copyNodeModule } = require("../scripts/util/copy-nodemodule"); +const { + installAndCopyNodeModules, +} = require("../extensions/vscode/scripts/install-copy-nodemodule"); const bin = path.join(__dirname, "bin"); const out = path.join(__dirname, "out"); @@ -104,7 +106,7 @@ async function buildWithEsbuild() { } console.log(`[info] Downloading for ${target}...`); copyLanceDBPromises.push( - copyNodeModule(TARGET_TO_LANCEDB[target], "@lancedb"), + installAndCopyNodeModules(TARGET_TO_LANCEDB[target], "@lancedb"), ); } await Promise.all(copyLanceDBPromises).catch(() => { diff --git a/extensions/vscode/package-lock.json b/extensions/vscode/package-lock.json index 38efaa08a..349212a6a 100644 --- a/extensions/vscode/package-lock.json +++ b/extensions/vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "1.1.44", + "version": "1.1.45", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "continue", - "version": "1.1.44", + "version": "1.1.45", "license": "Apache-2.0", "dependencies": { "@continuedev/config-types": "^1.0.14", diff --git a/scripts/util/copy-nodemodule.js b/extensions/vscode/scripts/install-copy-nodemodule.js similarity index 92% rename from scripts/util/copy-nodemodule.js rename to extensions/vscode/scripts/install-copy-nodemodule.js index 361e2d891..a20d2dee4 100644 --- a/scripts/util/copy-nodemodule.js +++ b/extensions/vscode/scripts/install-copy-nodemodule.js @@ -1,12 +1,14 @@ /** - * @file Copy lancedb to the current directory. It is intended to run as a child process. + * @file Copy lancedb to the current directory. It is also intended to run as a child process. */ +const { fork } = require("child_process"); const fs = require("fs"); const path = require("path"); + const ncp = require("ncp").ncp; -const { execCmdSync } = require("."); -const { fork } = require("child_process"); + +const { execCmdSync } = require("../../../scripts/util"); async function installNodeModuleInTempDirAndCopyToCurrent(packageName, toCopy) { console.log(`Copying ${packageName} to ${toCopy}`); @@ -86,7 +88,7 @@ process.on("message", (msg) => { * @param {string} packageName the module to install and copy * @param {string} toCopy directory to copy into inside node modules */ -async function copyNodeModule(packageName, toCopy) { +async function installAndCopyNodeModules(packageName, toCopy) { const child = fork(__filename, { stdio: "inherit", cwd: process.cwd() }); child.send({ payload: { @@ -106,5 +108,5 @@ async function copyNodeModule(packageName, toCopy) { } module.exports = { - copyNodeModule, + installAndCopyNodeModules, }; diff --git a/extensions/vscode/scripts/prepackage.js b/extensions/vscode/scripts/prepackage.js index 622393a19..57fa5a52d 100644 --- a/extensions/vscode/scripts/prepackage.js +++ b/extensions/vscode/scripts/prepackage.js @@ -4,7 +4,6 @@ const path = require("path"); const ncp = require("ncp").ncp; const { rimrafSync } = require("rimraf"); -const { copyNodeModule } = require("../../../scripts/util/copy-nodemodule"); const { validateFilesPresent, execCmdSync, @@ -12,6 +11,7 @@ const { } = require("../../../scripts/util/index"); const { generateAndCopyConfigYamlSchema } = require("./generate-copy-config"); +const { installAndCopyNodeModules } = require("./install-copy-nodemodule"); const { copySqlite, copyEsbuild } = require("./install-copy-sqlite-esbuild"); const { installNodeModules } = require("./install-nodemodules"); const { writeBuildTimestamp, continueDir } = require("./utils"); @@ -280,12 +280,12 @@ void (async () => { await Promise.all([ copyEsbuild(target), copySqlite(target), - copyNodeModule(packageToInstall, "@lancedb"), + installAndCopyNodeModules(packageToInstall, "@lancedb"), ]); } else { // Download esbuild from npm in tmp and copy over console.log("[info] npm installing esbuild binary"); - await copyNodeModule("esbuild@0.17.19", "@esbuild"); + await installAndCopyNodeModules("esbuild@0.17.19", "@esbuild"); } console.log("[info] Copying sqlite node binding from core"); diff --git a/package-lock.json b/package-lock.json index 43530562e..06f811afa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,6 @@ "@typescript-eslint/parser": "^7.8.0", "concurrently": "^9.1.2", "eslint-plugin-import": "^2.29.1", - "ncp": "^2.0.0", "prettier": "^3.3.3", "prettier-plugin-tailwindcss": "^0.6.8", "typescript": "^5.6.3" @@ -2234,16 +2233,6 @@ "dev": true, "peer": true }, - "node_modules/ncp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", - "dev": true, - "license": "MIT", - "bin": { - "ncp": "bin/ncp" - } - }, "node_modules/object-inspect": { "version": "1.13.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", diff --git a/package.json b/package.json index 9100ad0cd..79e522af1 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "@typescript-eslint/parser": "^7.8.0", "concurrently": "^9.1.2", "eslint-plugin-import": "^2.29.1", - "ncp": "^2.0.0", "prettier": "^3.3.3", "prettier-plugin-tailwindcss": "^0.6.8", "typescript": "^5.6.3"