From ef6c3f84766c124068fec214fffe2949fbbac3f7 Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Fri, 17 May 2024 21:28:33 +0200 Subject: [PATCH] fix: rpc npm: fix local desktop development (#5583) typescript was complaining about missing `@deltachat/jsonrpc-client` when it wasn't installed locally --- deltachat-rpc-server/npm-package/.gitignore | 3 ++- .../npm-package/scripts/make_local_dev_version.py | 3 +++ .../scripts/update_optional_dependencies_and_version.js | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/deltachat-rpc-server/npm-package/.gitignore b/deltachat-rpc-server/npm-package/.gitignore index 511a7e1fa..7b439b696 100644 --- a/deltachat-rpc-server/npm-package/.gitignore +++ b/deltachat-rpc-server/npm-package/.gitignore @@ -1,2 +1,3 @@ platform_package -*.tgz \ No newline at end of file +*.tgz +package-lock.json \ No newline at end of file diff --git a/deltachat-rpc-server/npm-package/scripts/make_local_dev_version.py b/deltachat-rpc-server/npm-package/scripts/make_local_dev_version.py index 635a6014f..84330b4e9 100644 --- a/deltachat-rpc-server/npm-package/scripts/make_local_dev_version.py +++ b/deltachat-rpc-server/npm-package/scripts/make_local_dev_version.py @@ -29,3 +29,6 @@ subprocess.run(["python", "scripts/build_platform_package.py", host_target], cap # run update_optional_dependencies_and_version.js to adjust the package / make it installable locally subprocess.run(["node", "scripts/update_optional_dependencies_and_version.js", "--local"], capture_output=False, check=True) + +# typescript / npm local package installing/linking needs that this package has it's own node_modules folder +subprocess.run(["npm", "i"], capture_output=False, check=True) diff --git a/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js b/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js index 1c30d4806..5de23b4e5 100644 --- a/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js +++ b/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js @@ -54,4 +54,10 @@ for (const { folder_name, package_name } of platform_package_names) { : version; } +if (is_local) { + package_json.peerDependencies["@deltachat/jsonrpc-client"] = 'file:../../deltachat-jsonrpc/typescript' +} else { + package_json.peerDependencies["@deltachat/jsonrpc-client"] = "*" +} + await fs.writeFile("./package.json", JSON.stringify(package_json, null, 4));