From 6b69bc62f2525dd587f58273cf3c2a6a571ff169 Mon Sep 17 00:00:00 2001 From: Jordan Mielbrecht Date: Tue, 1 Oct 2024 07:53:34 -0700 Subject: [PATCH 1/3] edit package-lock to allow npm install on windows without wsl --- package-lock.json | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 728b67d3..fbc6faf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1064,7 +1064,8 @@ ], "optional": true, "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1079,7 +1080,8 @@ ], "optional": true, "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1094,7 +1096,8 @@ ], "optional": true, "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1108,7 +1111,8 @@ "x64" ], "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1122,7 +1126,8 @@ "x64" ], "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1167,7 +1172,8 @@ ], "optional": true, "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1225,7 +1231,8 @@ ], "optional": true, "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1240,7 +1247,8 @@ ], "optional": true, "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1255,7 +1263,8 @@ ], "optional": true, "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" @@ -1270,7 +1279,8 @@ ], "optional": true, "os": [ - "linux" + "linux", + "win32" ], "engines": { "node": ">= 10" From ae96e06c8a0b30f3d14161eb6d4d7aa5cc8e453b Mon Sep 17 00:00:00 2001 From: Jordan Mielbrecht Date: Tue, 8 Oct 2024 21:47:28 -0700 Subject: [PATCH 2/3] reverting changes to package-lock.json --- package-lock.json | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbc6faf4..76a1eea8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,6 @@ "@emotion/styled": "^11.13.0", "@mui/icons-material": "^5.16.4", "@mui/material": "^5.16.4", - "@napi-rs/simple-git-linux-x64-gnu": "^0.1.9", - "@napi-rs/simple-git-linux-x64-musl": "^0.1.16", "@types/node": "20.6.0", "@types/react": "18.2.21", "@types/react-dom": "18.2.7", @@ -34,6 +32,10 @@ "tailwind-merge": "^2.4.0", "tailwindcss": "3.3.3", "typescript": "5.2.2" + }, + "optionalDependencies": { + "@napi-rs/simple-git-linux-x64-gnu": "^0.1.9", + "@napi-rs/simple-git-linux-x64-musl": "^0.1.16" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -1064,8 +1066,7 @@ ], "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1080,8 +1081,7 @@ ], "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1096,8 +1096,7 @@ ], "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1110,9 +1109,9 @@ "cpu": [ "x64" ], + "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1125,9 +1124,9 @@ "cpu": [ "x64" ], + "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1172,8 +1171,7 @@ ], "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1231,8 +1229,7 @@ ], "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1247,8 +1244,7 @@ ], "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1263,8 +1259,7 @@ ], "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" @@ -1279,8 +1274,7 @@ ], "optional": true, "os": [ - "linux", - "win32" + "linux" ], "engines": { "node": ">= 10" From cc81187e2f4ed31dcc4b07db2e92b4cec6ad1b33 Mon Sep 17 00:00:00 2001 From: Jordan Mielbrecht Date: Tue, 8 Oct 2024 21:47:54 -0700 Subject: [PATCH 3/3] moving napir-rs deps to optionalDependencies --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e714679c..525cedd1 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,6 @@ "@emotion/styled": "^11.13.0", "@mui/icons-material": "^5.16.4", "@mui/material": "^5.16.4", - "@napi-rs/simple-git-linux-x64-gnu": "^0.1.9", - "@napi-rs/simple-git-linux-x64-musl": "^0.1.16", "@types/node": "20.6.0", "@types/react": "18.2.21", "@types/react-dom": "18.2.7", @@ -35,5 +33,9 @@ "tailwind-merge": "^2.4.0", "tailwindcss": "3.3.3", "typescript": "5.2.2" + }, + "optionalDependencies": { + "@napi-rs/simple-git-linux-x64-gnu": "^0.1.9", + "@napi-rs/simple-git-linux-x64-musl": "^0.1.16" } }