diff --git a/.npmrc b/.npmrc index 16216a4a2..daebfd521 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,3 @@ engine-strict = true save-exact = true +shell-emulator = true diff --git a/package.json b/package.json index ed79df9df..4c40d14f4 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,9 @@ "pnpm": { "overrides": { "@aiscript-dev/aiscript-languageserver": "-" + }, + "patchedDependencies": { + "re2": "scripts/dependency-patches/re2.patch" } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fab9f7b64..4d11b5ac4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,6 +9,11 @@ overrides: lodash: 4.17.21 '@aiscript-dev/aiscript-languageserver': '-' +patchedDependencies: + re2: + hash: 018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1 + path: scripts/dependency-patches/re2.patch + importers: .: @@ -371,7 +376,7 @@ importers: version: 3.4.1 re2: specifier: 1.21.4 - version: 1.21.4 + version: 1.21.4(patch_hash=018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1) redis-lock: specifier: 0.1.4 version: 0.1.4 @@ -20379,7 +20384,7 @@ snapshots: dependencies: setimmediate: 1.0.5 - re2@1.21.4: + re2@1.21.4(patch_hash=018babd22b7ce951bcd10d6246f1e541a7ac7ba212f7fa8985e774ece67d08e1): dependencies: install-artifact-from-github: 1.3.5 nan: 2.20.0 diff --git a/scripts/dependency-patches/re2.patch b/scripts/dependency-patches/re2.patch new file mode 100644 index 000000000..3e7ec9f56 --- /dev/null +++ b/scripts/dependency-patches/re2.patch @@ -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",