mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-17 03:03:37 +00:00
80a06efe90
The now-removed patch is in this release. Notably, upstream commit e2ca52a3ff7bceb282f266fe49b974ca0c401358 has given quite a bit of grief here. They changed `apps/desktop/src/package.json` to add an external dependency for the first time, but neglected to update the corresponding `package-lock.json`. However, simply updating that is not enough as the build process does not copy it into the `apps/desktop/build` dir where `electron-builder` is ultimately run in, and it is `electron-builder` in its "installing production dependencies" step that performs an `npm install` in that directory. Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.2.0...desktop-v2024.3.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.3.0
29 lines
976 B
Diff
29 lines
976 B
Diff
From 0629bb5b90e54491263e371bc5594e9f97ba0af4 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Marshall <andrew@johnandrewmarshall.com>
|
|
Date: Tue, 12 Mar 2024 11:48:15 -0400
|
|
Subject: [PATCH] Fix using unlocked dependencies in electron-builder
|
|
|
|
electron-builder will perform its "installing production dependencies"
|
|
step using this package.json, and without the package-lock.json, NPM
|
|
will try to fetch package metadata to install the latest, unlocked
|
|
dependencies.
|
|
---
|
|
apps/desktop/webpack.main.js | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/apps/desktop/webpack.main.js b/apps/desktop/webpack.main.js
|
|
index 9d683457d9..0ad707956e 100644
|
|
--- a/apps/desktop/webpack.main.js
|
|
+++ b/apps/desktop/webpack.main.js
|
|
@@ -70,6 +70,7 @@ const main = {
|
|
new CopyWebpackPlugin({
|
|
patterns: [
|
|
"./src/package.json",
|
|
+ "./src/package-lock.json",
|
|
{ from: "./src/images", to: "images" },
|
|
{ from: "./src/locales", to: "locales" },
|
|
],
|
|
--
|
|
2.43.2
|
|
|