Merge pull request #31 from dmose/fix-ci-lint-and-prettier-30

Switch CI to node 12.16 (fixes #30)

.circleci/config.yml

@@ -1,13 +1,9 @@
 version: 2
 
 shared:
-  node8: &node8
+  node12: &node12
     docker:
-      - image: circleci/node:9
-
-  node9: &node9
-    docker:
-      - image: circleci/node:9
+      - image: cimg/node:12.22
 
   restore-yarn-cache: &restore-yarn-cache
     restore_cache:
@@ -43,50 +39,28 @@ shared:
           command: yarn lint
 
 jobs:
-  build-node8:
+  build-node12:
     <<: *build
-    <<: *node8
+    <<: *node12
 
-  test-node8:
+  test-node12:
     <<: *test
-    <<: *node8
+    <<: *node12
 
-  lint-node8:
+  lint-node12:
     <<: *lint
-    <<: *node8
-
-  build-node9:
-    <<: *build
-    <<: *node9
-
-  test-node9:
-    <<: *test
-    <<: *node9
-
-  lint-node9:
-    <<: *lint
-    <<: *node9
+    <<: *node12
 
 workflows:
   version: 2
   pr:
     jobs:
-      - build-node8
-
-      - test-node8:
-          requires:
-            - build-node8
-
-      - lint-node8:
-          requires:
-            - build-node8
-
-      - build-node9
+      - build-node12
 
-      - lint-node9:
+      - lint-node12:
           requires:
-            - build-node9
+            - build-node12
 
-      - test-node9:
+      - test-node12:
           requires:
-            - build-node9
+            - build-node12

lib/Jexl.js

@@ -84,7 +84,8 @@ Jexl.prototype.addTransform = function(name, fn) {
  */
 Jexl.prototype.addTransforms = function(map) {
   for (var key in map) {
-    if (map.hasOwnProperty(key)) this._transforms[key] = map[key];
+    if (Object.prototype.hasOwnProperty.call(map, key))
+      this._transforms[key] = map[key];
   }
 };
 
@@ -192,7 +193,7 @@ Jexl.prototype._getCustomGrammar = function() {
   if (!this._customGrammar) {
     this._customGrammar = {};
     for (var key in defaultGrammar) {
-      if (defaultGrammar.hasOwnProperty(key))
+      if (Object.prototype.hasOwnProperty.call(defaultGrammar, key))
         this._customGrammar[key] = defaultGrammar[key];
     }
   }

package.json

@@ -39,11 +39,11 @@
   "devDependencies": {
     "chai": "^2.0.0",
     "chai-as-promised": "^4.2.0",
-    "mocha": "^2.1.0",
-    "eslint": "^4.18.1",
+    "eslint": "^8.24.0",
     "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-prettier": "^2.6.0",
     "license-webpack-plugin": "0.5.1",
+    "mocha": "^2.1.0",
     "prettier": "^1.10.2",
     "webpack": "3.1.0"
   }

vendor/mozjexl.jsm

@@ -370,7 +370,8 @@ Jexl.prototype.addTransform = function(name, fn) {
  */
 Jexl.prototype.addTransforms = function(map) {
   for (var key in map) {
-    if (map.hasOwnProperty(key)) this._transforms[key] = map[key];
+    if (Object.prototype.hasOwnProperty.call(map, key))
+      this._transforms[key] = map[key];
   }
 };
 
@@ -478,7 +479,7 @@ Jexl.prototype._getCustomGrammar = function() {
   if (!this._customGrammar) {
     this._customGrammar = {};
     for (var key in defaultGrammar) {
-      if (defaultGrammar.hasOwnProperty(key))
+      if (Object.prototype.hasOwnProperty.call(defaultGrammar, key))
         this._customGrammar[key] = defaultGrammar[key];
     }
   }