From 6c727ab678c8647d30f6e4d22934749931a8769f Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 19 Jan 2024 18:40:28 +0800 Subject: [PATCH] core: use new require-resolve-hook --- packages/hydrooj/bin/hydrooj.js | 4 ++-- packages/hydrooj/package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/hydrooj/bin/hydrooj.js b/packages/hydrooj/bin/hydrooj.js index 53bbe06ab..53d191f26 100755 --- a/packages/hydrooj/bin/hydrooj.js +++ b/packages/hydrooj/bin/hydrooj.js @@ -3,7 +3,7 @@ require('@hydrooj/utils/lib/register'); const packageBasedir = require('path').resolve(__dirname, '..'); const { homedir } = require('os'); -const { default: hook } = require('require-resolve-hook'); +const { default: hook } = require('@undefined-moe/require-resolve-hook'); const { bypass } = hook(/^(hydrooj|@hydrooj|cordis|lodash|js-yaml)($|\/)/, (id) => { if (id.startsWith('hydrooj/src')) { console.log('module require via %s is deprecated.', id); @@ -33,7 +33,7 @@ const { bypass } = hook(/^(hydrooj|@hydrooj|cordis|lodash|js-yaml)($|\/)/, (id) } } }); -}); +}, { ignoreModuleNotFoundError: false }); // Replace pnpm paths. // Vscode will try to open a local file for links, so this doesn't work for remote-ssh, etc. diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index a9c364ef6..1674e63b3 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -12,13 +12,14 @@ }, "preferUnplugged": true, "dependencies": { - "@aws-sdk/client-s3": "3.490.0", + "@aws-sdk/client-s3": "3.495.0", "@aws-sdk/lib-storage": "3.490.0", "@aws-sdk/s3-presigned-post": "3.490.0", - "@aws-sdk/s3-request-presigner": "3.490.0", + "@aws-sdk/s3-request-presigner": "3.495.0", "@graphql-tools/schema": "^10.0.2", "@hydrooj/utils": "workspace:*", "@simplewebauthn/server": "7.4.0", + "@undefined-moe/require-resolve-hook": "^1.1.0", "adm-zip": "0.5.5", "cac": "^6.7.14", "cordis": "2.8.8", @@ -45,7 +46,6 @@ "notp": "^2.0.3", "p-queue": "^8.0.1", "path-to-regexp": "^6.2.1", - "require-resolve-hook": "^1.1.0", "sanitize-filename": "^1.6.3", "saslprep": "^1.0.3", "schemastery": "^3.14.3",