fix(sec): redos, release (#543)

WFCD · Jun 27, 2024 · 2e3eef9 · 2e3eef9
1 parent fc0f05c
commit 2e3eef9
Show file tree

Hide file tree

Showing 10 changed files with 5,022 additions and 3,508 deletions.
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -1,10 +1,13 @@
+root: true
 parser: '@babel/eslint-parser'
 parserOptions:
   ecmaFeatures:
     modules: true
   ecmaVersion: 6
   sourceType: module
-extends: '@wfcd/eslint-config/strict-esm-jsdoc'
+extends:
+  - '@wfcd/eslint-config/strict-esm-jsdoc'
+  - 'plugin:redos/recommended'
 rules:
   import/extensions:
     - error

diff --git a/.lintstagedrc.yaml b/.lintstagedrc.yaml
@@ -1,7 +1,7 @@
 '*.**,!package*.json':
   - 'npm run fmt:fix'
 '*.js':
-  - eslint --fix --cache
+  - eslint -c .eslintrc.yaml --fix --cache
   - npm test -- --reporter=mocha-minimalist-reporter
 package*.json:
   - npm dedupe

diff --git a/.npmignore b/.npmignore
@@ -47,4 +47,4 @@ package.json.backup
 .lintstagedrc.yaml
 .mocharc.yml
 babel.config.cjs
-clean-package.config.js
+clean-package.config.cjs
diff --git a/clean-package.config.js → clean-package.config.cjs b/clean-package.config.js → clean-package.config.cjs
@@ -1,4 +1,4 @@
-export default {
+module.exports = {
   remove: [
     'devDependencies',
     'scripts',

diff --git a/lib/WorldState.js b/lib/WorldState.js
@@ -87,7 +87,7 @@ export const parseAsyncArray = async (ParserClass, dataArray, deps, uniqueField)
   }
   if (uniqueField) {
     const utemp = {};
-    arr.sort((a, b) => a.id.localeCompare(b.id));
+    arr.sort((a, b) => a.id?.localeCompare(b.id));
     arr.forEach((obj) => {
       utemp[obj[uniqueField]] = obj;
     });

diff --git a/lib/supporting/RewardTypes.js b/lib/supporting/RewardTypes.js
@@ -242,7 +242,7 @@ export default [
   {
     name: 'endo',
     description: 'Endo',
-    test: (s) => /\d+\sendo/i.test(s),
+    test: (s) => /^\d+x?\sendo/i.test(s),
     thumbnail: wfCdn('endo.png'),
     color: 0xc2a24c,
   },