From f830932f74c0536d1a736e2ae9b106c2374b88f3 Mon Sep 17 00:00:00 2001 From: lance315 <145085835+lance315@users.noreply.github.com> Date: Tue, 16 Jan 2024 17:45:20 +0800 Subject: [PATCH 1/2] Update .eslintrc.js Fix 'npm run lint' error. --- .eslintrc.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 9e80f9a..81bee71 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,7 +3,7 @@ module.exports = { "browser": true, "es2021": true, "mocha": true, - "request": true + "node": true }, "extends": "eslint:recommended", "overrides": [ @@ -13,5 +13,9 @@ module.exports = { "sourceType": "module" }, "rules": { + }, + "globals": { + "expect": true, + "request": true } } From 888990c644fdf27f9e3e085296c8e2a2dd4e1570 Mon Sep 17 00:00:00 2001 From: lance315 <145085835+lance315@users.noreply.github.com> Date: Tue, 16 Jan 2024 17:47:40 +0800 Subject: [PATCH 2/2] Update controller.js --- api/controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/controller.js b/api/controller.js index 949731c..797d0f7 100644 --- a/api/controller.js +++ b/api/controller.js @@ -29,13 +29,13 @@ exports.calculate = function(req, res) { } if (!req.query.operand1 || - !req.query.operand1.match(/^(-)?[0-9\.]+(e(-)?[0-9]+)?$/) || + !req.query.operand1.match(/^(-)?[0-9.]+(e(-)?[0-9]+)?$/) || req.query.operand1.replace(/[-0-9e]/g, '').length > 1) { throw new Error("Invalid operand1: " + req.query.operand1); } if (!req.query.operand2 || - !req.query.operand2.match(/^(-)?[0-9\.]+(e(-)?[0-9]+)?$/) || + !req.query.operand2.match(/^(-)?[0-9.]+(e(-)?[0-9]+)?$/) || req.query.operand2.replace(/[-0-9e]/g, '').length > 1) { throw new Error("Invalid operand2: " + req.query.operand2); }