fix(deps): pnpm v10でre2のインストールに失敗することがある問題を修正 (#15627)
* fix(deps): pnpm v10でre2のインストールに失敗することがある問題を修正 * fix * fix docker build * fix build failure on Windows
This commit is contained in:
parent
6d93725084
commit
e16a14dcef
1
.npmrc
1
.npmrc
@ -1,2 +1,3 @@
|
|||||||
engine-strict = true
|
engine-strict = true
|
||||||
save-exact = true
|
save-exact = true
|
||||||
|
shell-emulator = true
|
||||||
|
@ -82,6 +82,9 @@
|
|||||||
"pnpm": {
|
"pnpm": {
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"@aiscript-dev/aiscript-languageserver": "-"
|
"@aiscript-dev/aiscript-languageserver": "-"
|
||||||
|
},
|
||||||
|
"patchedDependencies": {
|
||||||
|
"re2": "scripts/dependency-patches/re2.patch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
9
pnpm-lock.yaml
generated
9
pnpm-lock.yaml
generated
@ -9,6 +9,11 @@ overrides:
|
|||||||
lodash: 4.17.21
|
lodash: 4.17.21
|
||||||
'@aiscript-dev/aiscript-languageserver': '-'
|
'@aiscript-dev/aiscript-languageserver': '-'
|
||||||
|
|
||||||
|
patchedDependencies:
|
||||||
|
re2:
|
||||||
|
hash: 018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1
|
||||||
|
path: scripts/dependency-patches/re2.patch
|
||||||
|
|
||||||
importers:
|
importers:
|
||||||
|
|
||||||
.:
|
.:
|
||||||
@ -371,7 +376,7 @@ importers:
|
|||||||
version: 3.4.1
|
version: 3.4.1
|
||||||
re2:
|
re2:
|
||||||
specifier: 1.21.4
|
specifier: 1.21.4
|
||||||
version: 1.21.4
|
version: 1.21.4(patch_hash=018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1)
|
||||||
redis-lock:
|
redis-lock:
|
||||||
specifier: 0.1.4
|
specifier: 0.1.4
|
||||||
version: 0.1.4
|
version: 0.1.4
|
||||||
@ -20379,7 +20384,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
setimmediate: 1.0.5
|
setimmediate: 1.0.5
|
||||||
|
|
||||||
re2@1.21.4:
|
re2@1.21.4(patch_hash=018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1):
|
||||||
dependencies:
|
dependencies:
|
||||||
install-artifact-from-github: 1.3.5
|
install-artifact-from-github: 1.3.5
|
||||||
nan: 2.20.0
|
nan: 2.20.0
|
||||||
|
13
scripts/dependency-patches/re2.patch
Normal file
13
scripts/dependency-patches/re2.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/package.json b/package.json
|
||||||
|
index a56ab59ef647288ee6028abd2b1780eaa92ebc9d..ec2c43e63f3134b6d54d616b2ef715447f873bbe 100644
|
||||||
|
--- a/package.json
|
||||||
|
+++ b/package.json
|
||||||
|
@@ -28,7 +28,7 @@
|
||||||
|
"test": "node tests/tests.js",
|
||||||
|
"ts-test": "tsc",
|
||||||
|
"save-to-github": "save-to-github-cache --artifact build/Release/re2.node",
|
||||||
|
- "install": "install-from-cache --artifact build/Release/re2.node --host-var RE2_DOWNLOAD_MIRROR --skip-path-var RE2_DOWNLOAD_SKIP_PATH --skip-ver-var RE2_DOWNLOAD_SKIP_VER || node-gyp -j max rebuild",
|
||||||
|
+ "install": "npm_package_github=https://github.com/uhop/node-re2 npm_package_scripts_verify_build=true install-from-cache --artifact build/Release/re2.node --host-var RE2_DOWNLOAD_MIRROR --skip-path-var RE2_DOWNLOAD_SKIP_PATH --skip-ver-var RE2_DOWNLOAD_SKIP_VER || node-gyp -j max rebuild",
|
||||||
|
"verify-build": "node scripts/verify-build.js",
|
||||||
|
"build:dev": "node-gyp -j max build --debug",
|
||||||
|
"build": "node-gyp -j max build",
|
Loading…
x
Reference in New Issue
Block a user