Selaa lähdekoodia

- Linting: As per latest ash-nazg
- npm: Update deps (command-line-basics, express-rate-limit, fsevents), devDeps

Brett Zamir 5 vuotta sitten
vanhempi
commit
77770bee30
7 muutettua tiedostoa jossa 604 lisäystä ja 230 poistoa
  1. 8 1
      .eslintrc.js
  2. 5 4
      api/controllers/bDateController.js
  3. 2 2
      bin/bahai-date-api.js
  4. 2 2
      bin/optionDefinitions.js
  5. 566 200
      package-lock.json
  6. 20 20
      package.json
  7. 1 1
      server.js

+ 8 - 1
.eslintrc.js

@@ -1,7 +1,14 @@
+'use strict';
 module.exports = {
   extends: ['ash-nazg/sauron-node', 'plugin:node/recommended-script'],
   rules: {
     'import/no-commonjs': 0,
-    'node/exports-style': 0
+    'node/exports-style': 0,
+
+    // Browser
+    'compat/compat': 0,
+
+    // Prefer unicorn's version of the rule
+    'no-process-exit': 0
   }
 };

+ 5 - 4
api/controllers/bDateController.js

@@ -6,10 +6,11 @@ const BadiCal = require('../../vendor/assets/badi-cal/index.js');
  * @returns {Integer}
  */
 function sanitizeInput (s) {
-  if (s === '' || s === undefined || s === null || s === false || isNaN(s)) {
+  if (s === '' || s === undefined || s === null || s === false ||
+    Number.isNaN(Number(s))) {
     return 0;
   }
-  return parseInt(s);
+  return Number.parseInt(s);
 }
 
 exports.test = function (req, res) {
@@ -70,7 +71,7 @@ const getTodayJSON = exports.getTodayJSON = function () {
 
 exports.today = function (req, res) {
   const {json, nowBadi} = getTodayJSON();
-  // eslint-disable-next-line no-console
+  // eslint-disable-next-line no-console -- CLI
   console.log('Today: ' + nowBadi.toString());
   res.json(json);
 };
@@ -81,7 +82,7 @@ exports.todayHtml = function (req, res) {
 
 exports.date = function (req, res) {
   const dateInfo = getDate(req.query);
-  // eslint-disable-next-line no-console
+  // eslint-disable-next-line no-console -- CLI
   console.log(
     'Date: ' + dateInfo.now.toString() + ' -> ' + dateInfo.nowBadi.toString()
   );

+ 2 - 2
bin/bahai-date-api.js

@@ -12,7 +12,7 @@ const optionDefinitions = cliBasics(
 );
 
 if (!optionDefinitions) { // cliBasics handled
-  process.exit(); // eslint-disable-line no-process-exit
+  process.exit();
 }
 
 const {date, verbose} = optionDefinitions;
@@ -33,5 +33,5 @@ if (date) {
 }
 
 const output = verbose ? dateObj : dateObj.json.message;
-// eslint-disable-next-line no-console
+// eslint-disable-next-line no-console -- CLI
 console.log(output);

+ 2 - 2
bin/optionDefinitions.js

@@ -2,11 +2,11 @@
 
 const pkg = require('../package.json');
 
-/* eslint-disable jsdoc/require-property */
+/* eslint-disable jsdoc/require-property -- Schema is already below */
 /**
 * @typedef {PlainObject} CoveradgeOptions
 */
-/* eslint-enable jsdoc/require-property */
+/* eslint-enable jsdoc/require-property -- Schema is already below */
 
 const optionDefinitions = [
   {

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 566 - 200
package-lock.json


+ 20 - 20
package.json

@@ -36,34 +36,34 @@
   "homepage": "https://github.com/dragfyre/bahai-date-api#readme",
   "devDependencies": {
     "@mysticatea/eslint-plugin": "^13.0.0",
-    "command-line-publish": "^0.6.0",
-    "eslint": "^6.8.0",
-    "eslint-config-ash-nazg": "^16.4.0",
-    "eslint-config-standard": "^14.1.0",
-    "eslint-plugin-array-func": "^3.1.3",
-    "eslint-plugin-compat": "^3.3.0",
-    "eslint-plugin-eslint-comments": "^3.1.2",
-    "eslint-plugin-html": "^6.0.0",
-    "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-jsdoc": "^20.0.5",
-    "eslint-plugin-markdown": "^1.0.1",
-    "eslint-plugin-no-unsanitized": "^3.0.2",
-    "eslint-plugin-no-use-extend-native": "^0.4.1",
-    "eslint-plugin-node": "^11.0.0",
+    "command-line-publish": "^0.7.0",
+    "eslint": "^7.6.0",
+    "eslint-config-ash-nazg": "^22.7.0",
+    "eslint-config-standard": "^14.1.1",
+    "eslint-plugin-array-func": "^3.1.7",
+    "eslint-plugin-compat": "^3.8.0",
+    "eslint-plugin-eslint-comments": "^3.2.0",
+    "eslint-plugin-html": "^6.0.3",
+    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-jsdoc": "^30.2.2",
+    "eslint-plugin-markdown": "^1.0.2",
+    "eslint-plugin-no-unsanitized": "^3.1.2",
+    "eslint-plugin-no-use-extend-native": "^0.5.0",
+    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-sonarjs": "^0.5.0",
     "eslint-plugin-standard": "^4.0.1",
-    "eslint-plugin-unicorn": "^15.0.1",
-    "nodemon": "^2.0.2",
-    "typescript": "^3.7.4"
+    "eslint-plugin-unicorn": "^21.0.0",
+    "nodemon": "^2.0.4",
+    "typescript": "^3.9.7"
   },
   "dependencies": {
     "body-parser": "^1.19.0",
-    "command-line-basics": "^0.6.2",
+    "command-line-basics": "^0.8.0",
     "deep-extend": "^0.6.0",
     "express": "^4.17.1",
-    "express-rate-limit": "^5.0.0",
-    "fsevents": "^2.1.2",
+    "express-rate-limit": "^5.1.3",
+    "fsevents": "^2.1.3",
     "randomatic": "^3.1.1",
     "rc": "^1.2.8"
   }

+ 1 - 1
server.js

@@ -21,5 +21,5 @@ routes(app); // register the route
 
 app.listen(port);
 
-// eslint-disable-next-line no-console
+// eslint-disable-next-line no-console -- CLI
 console.log('Baha\'i Date RESTful API server started: Port ' + port);

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä