Make App.js ES5-compatible again, update ESLint rules around ES versions

derbyjs · Jun 17, 2023 · 29aa680 · 29aa680
1 parent fe7ac40
commit 29aa680
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -3,7 +3,7 @@
     "node": true
   },
   "parserOptions": {
-    "ecmaVersion": 8
+    "ecmaVersion": 5
   },
   "globals": {
     "window": false,
@@ -37,7 +37,15 @@
   },
   "overrides": [
     {
-      "files": ["test/**/*.mocha.js", "test/browser/*.js"],
+      // Files that are only run in Node can use more modern ES syntax.
+      "files": ["**/*ForServer.js", "test/**/*.mocha.js"],
+      "parserOptions": {
+        // Node 16 LTS supports up through ES2021.
+        "ecmaVersion": 2021
+      }
+    },
+    {
+      "files": ["test/**/*.js"],
       "env": {"mocha": true, "node": true}
     }
   ]

diff --git a/lib/App.js b/lib/App.js
@@ -17,7 +17,8 @@ var PageBase = require('./Page');
 
 module.exports = App;
 
-globalThis.APPS = globalThis.APPS || new Map();
+// TODO: Change to Map once we officially drop support for ES5.
+global.APPS = global.APPS || {};
 
 function App(derby, name, filename, options) {
   EventEmitter.call(this);
@@ -71,14 +72,14 @@ App.prototype._finishInit = function() {
 
   var previousAppInfo;
   if (!util.isProduction) {
-    previousAppInfo = globalThis.APPS.get(this.name);
+    previousAppInfo = global.APPS[this.name];
     if (previousAppInfo) {
       previousAppInfo.app._destroyCurrentPage();
     }
-    globalThis.APPS.set(this.name, {
+    global.APPS[this.name] = {
       app: this,
       initialState: data,
-    });
+    };
   }
 
   this.model.createConnection(data);
@@ -120,7 +121,7 @@ App.prototype._getAppData = function () {
   if (script) {
     return App._parseInitialData(script.textContent);
   } else {
-    return globalThis.APPS.get(this.name).initialState;
+    return global.APPS[this.name].initialState;
   }
 }