refactor: fix deprecation in tests & update eslint

eslint.config.mjs

@@ -0,0 +1,19 @@
+import { ESLintConfig } from "@openally/config.eslint";
+
+export default [
+  {
+    ignores: [
+      "**/test/fixtures/**/*.js",
+      "**/test/probes/fixtures/**/*.js"
+    ]
+  },
+  ...ESLintConfig,
+  {
+    languageOptions: {
+      sourceType: "module",
+      parserOptions: {
+        requireConfigFile: false
+      }
+    }
+  }
+];

package.json

@@ -8,8 +8,7 @@
     "node": ">=18.0.0"
   },
   "scripts": {
-    "lint": "eslint src test",
-    "prepublishOnly": "pkg-ok",
+    "lint": "eslint src workspaces test",
     "test-only": "glob -c \"node --test-reporter=spec --test\" \"./test/**/*.spec.js\"",
     "test": "c8 --all --src ./src -r html npm run test-only",
     "check": "npm run lint && npm run test-only"
@@ -54,13 +53,10 @@
     "ts-pattern": "^5.0.6"
   },
   "devDependencies": {
-    "@nodesecure/eslint-config": "^1.6.0",
+    "@openally/config.eslint": "^1.0.0",
     "@types/node": "^22.0.0",
     "c8": "^10.1.2",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.0.0",
     "glob": "^11.0.0",
-    "iterator-matcher": "^2.1.0",
-    "pkg-ok": "^3.0.0"
+    "iterator-matcher": "^2.1.0"
   }
 }

src/probes/isLiteral.js

@@ -5,6 +5,7 @@ import { builtinModules } from "repl";
 import { Hex } from "@nodesecure/sec-literal";
 
 const kMapRegexIps = Object.freeze({
+  // eslint-disable-next-line @stylistic/max-len
   regexIPv4: /^(https?:\/\/)(?!127\.)(?!.*:(?:0{1,3}|25[6-9])\.)(?!.*:(?:25[6-9])\.(?:0{1,3}|25[6-9])\.)(?!.*:(?:25[6-9])\.(?:25[6-9])\.(?:0{1,3}|25[6-9])\.)(?!.*:(?:25[6-9])\.(?:25[6-9])\.(?:25[6-9])\.(?:0{1,3}|25[6-9]))((?:\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])(?::\d{1,5})?(\/[^\s]*)?$/,
   regexIPv6: /^(https?:\/\/)(\[[0-9A-Fa-f:]+\])(?::\d{1,5})?(\/[^\s]*)?$/
 });

test/AstAnalyser.spec.js

@@ -351,7 +351,6 @@ describe("AstAnalyser", (t) => {
         });
       });
 
-
       it("intialize should be called before finalize", async() => {
         const calls = [];
 
@@ -461,7 +460,6 @@ describe("AstAnalyser", (t) => {
         });
       });
 
-
       it("intialize should be called before finalize", () => {
         const calls = [];
 

test/fixtures/entryFiles/deps/default.cjs

@@ -1,2 +1,2 @@
-require('externalDep')
-require('dep.cjs')
+require("externalDep");
+require("dep.cjs");

test/fixtures/entryFiles/deps/default.js

@@ -1 +1 @@
-require('externalDep')
+require("externalDep");

test/fixtures/entryFiles/deps/default.mjs

@@ -1,2 +1,2 @@
-import externalDep from 'externalDep';
-import('dep.mjs')
+import externalDep from "externalDep";
+import("dep.mjs");

test/fixtures/entryFiles/deps/dep.cjs

@@ -1 +1 @@
-module.exports = {}
+module.exports = {};

test/fixtures/entryFiles/deps/dep.mjs

@@ -1 +1 @@
-export {}
+export {};

test/fixtures/issues/html-comments.js

@@ -6,4 +6,4 @@ var bar;
 // == fake comment == //
 
 const yo = 5;
-//-->;
+// -->;

test/fixtures/issues/prop-types.min.js

@@ -23,4 +23,44 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-!function(f){"object"==typeof exports&&"undefined"!=typeof module?module.exports=f():"function"==typeof define&&define.amd?define([],f):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).PropTypes=f()}(function(){return function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var p="function"==typeof require&&require;if(!f&&p)return p(i,!0);if(u)return u(i,!0);throw(p=new Error("Cannot find module '"+i+"'")).code="MODULE_NOT_FOUND",p}p=n[i]={exports:{}},e[i][0].call(p.exports,function(r){return o(e[i][1][r]||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}({1:[function(require,module,exports){"use strict";var ReactPropTypesSecret=require(3);function emptyFunction(){}function emptyFunctionWithReset(){}emptyFunctionWithReset.resetWarningCache=emptyFunction,module.exports=function(){function e(e,t,n,r,o,c){if(c!==ReactPropTypesSecret){c=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw c.name="Invariant Violation",c}}function t(){return e}var n={array:e.isRequired=e,bigint:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,elementType:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t,checkPropTypes:emptyFunctionWithReset,resetWarningCache:emptyFunction};return n.PropTypes=n}},{3:3}],2:[function(require,module,exports){module.exports=require(1)()},{1:1}],3:[function(require,module,exports){"use strict";module.exports="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED"},{}]},{},[2])(2)});
+!(function(f) {
+  typeof exports == "object" && typeof module != "undefined" ? module.exports = f() : typeof define == "function" && define.amd ? define([], f) : (typeof window != "undefined" ? window : typeof global != "undefined" ? global : typeof self != "undefined" ? self : this).PropTypes = f();
+}(function() {
+  return (function r(e, n, t) {
+    function o(i, f) {
+      if (!n[i]) {
+        if (!e[i]) {
+          var p = typeof require == "function" && require; if (!f && p) {
+            return p(i, !0);
+          } if (u) {
+            return u(i, !0);
+          } throw (p = new Error("Cannot find module '" + i + "'")).code = "MODULE_NOT_FOUND", p;
+        }p = n[i] = { exports: {} }, e[i][0].call(p.exports, function(r) {
+          return o(e[i][1][r] || r);
+        }, p, p.exports, r, e, n, t);
+      }
+
+      return n[i].exports;
+    } for (var u = typeof require == "function" && require, i = 0; i < t.length; i++) {
+      o(t[i]);
+    }
+
+    return o;
+  }({ 1: [function(require, module, exports) {
+    "use strict"; const ReactPropTypesSecret = require(3); function emptyFunction() {} function emptyFunctionWithReset() {}emptyFunctionWithReset.resetWarningCache = emptyFunction, module.exports = function() {
+      function e(e, t, n, r, o, c) {
+        if (c !== ReactPropTypesSecret) {
+          c = new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types"); throw c.name = "Invariant Violation", c;
+        }
+      } function t() {
+        return e;
+      } const n = { array: e.isRequired = e, bigint: e, bool: e, func: e, number: e, object: e, string: e, symbol: e, any: e, arrayOf: t, element: e, elementType: e, instanceOf: t, node: e, objectOf: t, oneOf: t, oneOfType: t, shape: t, exact: t, checkPropTypes: emptyFunctionWithReset, resetWarningCache: emptyFunction };
+
+      return n.PropTypes = n;
+    };
+  }, { 3: 3 }], 2: [function(require, module, exports) {
+    module.exports = require(1)();
+  }, { 1: 1 }], 3: [function(require, module, exports) {
+    "use strict"; module.exports = "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";
+  }, {}] }, {}, [2]))(2);
+}));

test/fixtures/obfuscated/freejsobfuscator.js

@@ -1,22 +1,23 @@
 var _cs = [
-    "\x7a\x7a\x7a",
-    "\x24\x24\x20",
-    "\x6d\x61\x74\x68",
-    "\x74\x69\x6d\x65",
-    "\x74\x69\x6d\x65",
-    "\x62\x62\x62",
-    "\x20\x24",
-    "\x61\x61\x61",
-    "\x79\x79\x79",
-    "\x42\x79"
-  ]
-  function _f1(_p2, _p1, _p0) {
-    var _v0 = _p2 + _p0 + _p1
-    var _v1 = "[" + _v0 + "]"
-    return _v1
-  }
-  function _f0() {}
-  var _g0 = _f1(_cs[7], _cs[5], "-")
-  _g0 += _cs[6] + _cs[1]
-  _g0 += _f1(_cs[0], _cs[8], "-")
-  alert(_g0)
+  "\x7a\x7a\x7a",
+  "\x24\x24\x20",
+  "\x6d\x61\x74\x68",
+  "\x74\x69\x6d\x65",
+  "\x74\x69\x6d\x65",
+  "\x62\x62\x62",
+  "\x20\x24",
+  "\x61\x61\x61",
+  "\x79\x79\x79",
+  "\x42\x79"
+];
+function _f1(_p2, _p1, _p0) {
+  const _v0 = _p2 + _p0 + _p1;
+  const _v1 = "[" + _v0 + "]";
+
+  return _v1;
+}
+function _f0() {}
+var _g0 = _f1(_cs[7], _cs[5], "-");
+_g0 += _cs[6] + _cs[1];
+_g0 += _f1(_cs[0], _cs[8], "-");
+alert(_g0);

test/fixtures/obfuscated/jjencode.js

@@ -1,4 +1,4 @@
-boo = ~[]
+boo = ~[];
 boo = {
   ___: ++boo,
   $$$$: (![] + "")[boo],
@@ -16,7 +16,7 @@ boo = {
   $$$: ++boo,
   $___: ++boo,
   $__$: ++boo
-}
+};
 boo.$_ =
   (boo.$_ = boo + "")[boo.$_$] +
   (boo._$ = boo.$_[boo.__$]) +
@@ -28,22 +28,22 @@ boo.$_ =
   boo.$_[boo.$_$] +
   boo.__ +
   boo._$ +
-  boo.$
-boo.$$ = boo.$ + (!"" + "")[boo._$$] + boo.__ + boo._ + boo.$ + boo.$$
-boo.$ = boo.___[boo.$_][boo.$_]
+  boo.$;
+boo.$$ = boo.$ + (!"" + "")[boo._$$] + boo.__ + boo._ + boo.$ + boo.$$;
+boo.$ = boo.___[boo.$_][boo.$_];
 boo.$(
   boo.$(
     boo.$$ +
-      '"' +
-      boo.$_$_ +
-      (![] + "")[boo._$_] +
-      boo.$$$_ +
-      "\\" +
-      boo.__$ +
-      boo.$$_ +
-      boo._$_ +
-      boo.__ +
-      '(\\"\\' +
+    "\"" +
+    boo.$_$_ +
+    (![] + "")[boo._$_] +
+    boo.$$$_ +
+    "\\" +
+    boo.__$ +
+    boo.$$_ +
+    boo._$_ +
+    boo.__ +
+    "(\\\"\\" +
       boo.__$ +
       boo.__$ +
       boo.___ +
@@ -82,10 +82,10 @@ boo.$(
       boo.$$_ +
       boo.___ +
       boo.__ +
-      '\\"\\' +
+      "\\\"\\" +
       boo.$__ +
       boo.___ +
       ")" +
-      '"'
+      "\""
   )()
-)()
+)();