apostrophe 2.221.2 → 2.222.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.222.0 (2022-07-20)
+
+## Adds
+
+* `testModule: true` is now compatible with `mocha` 10.x as well as previously supported versions of `mocha`. Thanks to [Amin Shazrin](https://github.com/ammein) for this contribution.
+
+## Fixes
+
+* `sanitize-html` dependency bumped to ensure a potential denial-of-service vector is closed.
+
 ## 2.221.2 (2022-07-06)
 
 ## Fixes

package/index.js

@@ -256,7 +256,7 @@ module.exports = function(options) {
     while (m.parent) {
       // The test file is the root as far as we are concerned,
       // not mocha itself
-      if (m.parent.filename.match(/\/node_modules\/mocha\//)) {
+      if (m.parent.filename.match(new RegExp(`${path.sep}node_modules${path.sep}mocha${path.sep}`))) {
         return m;
       }
       m = m.parent;
@@ -415,20 +415,18 @@ module.exports = function(options) {
     // and throws an exception if we don't
     function findTestModule() {
       var m = module;
-      var nodeModuleRegex;
-      if (process.platform === "win32") {
-        nodeModuleRegex = /node_modules\\mocha/;
-      } else {
-        nodeModuleRegex = /node_modules\/mocha/;
+      var nodeModuleRegex = new RegExp("node_modules" + path.sep + "mocha");
+      if (!require.main.filename.match(nodeModuleRegex)) {
+        throw new Error('mocha does not seem to be running, is this really a test?');
       }
       while (m) {
         if (m.parent && m.parent.filename.match(nodeModuleRegex)) {
           return m;
+        } else if (!m.parent) {
+          // Mocha v10 doesn't inject mocha paths inside `module`, therefore, we only detect the parent until the last parent. But we can get Mocha running using `require.main` - Amin
+          return m;
         }
         m = m.parent;
-        if (!m) {
-          throw new Error('mocha does not seem to be running, is this really a test?');
-        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "2.221.2",
+  "version": "2.222.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
@@ -72,7 +72,7 @@
     "request-promise": "^4.2.4",
     "resolve": "^1.20.0",
     "rimraf": "^2.7.1",
-    "sanitize-html": "^2.4.0",
+    "sanitize-html": "^2.7.1",
     "server-destroy": "^1.0.1",
     "sluggo": "^0.2.0",
     "syntax-error": "^1.3.0",