Merge pull request #192 from benjiwheeler/update-eslint

chore: update eslint version, modify hasOwnProperty calls

Author: benjiwheeler

.travis.yml

@@ -4,7 +4,7 @@ cache:
   directories:
     - node_modules
 node_js:
-  - "8"
+  - "10"
   - "node"
 install:
   - npm install

package-lock.json

@@ -38,12 +38,12 @@
     "@commitlint/cli": "8.2.0",
     "@commitlint/config-conventional": "8.2.0",
     "@commitlint/travis-cli": "8.2.0",
-    "babel-eslint": "10.0.3",
+    "babel-eslint": "10.1.0",
     "babel-loader": "^8.0.4",
     "cz-conventional-changelog": "^3.0.2",
-    "eslint": "5.7.0",
-    "eslint-config-scratch": "5.1.0",
-    "eslint-plugin-react": "7.12.4",
+    "eslint": "^7.13.0",
+    "eslint-config-scratch": "^6.0.0",
+    "eslint-plugin-react": "^7.20.0",
     "file-loader": "4.1.0",
     "husky": "1.3.1",
     "json": "^9.0.4",

package.json

@@ -9,7 +9,6 @@ if (typeof TextDecoder === 'undefined' || typeof TextEncoder === 'undefined') {
     _TextDecoder = encoding.TextDecoder;
     _TextEncoder = encoding.TextEncoder;
 } else {
-    /* global TextDecoder TextEncoder */
     _TextDecoder = TextDecoder;
     _TextEncoder = TextEncoder;
 }
@@ -35,7 +34,7 @@ const memoizedToString = (function () {
 
     const strings = {};
     return (assetId, data) => {
-        if (!strings.hasOwnProperty(assetId)) {
+        if (!Object.prototype.hasOwnProperty.call(strings, assetId)) {
             if (typeof btoa === 'undefined') {
                 // Use a library that does not need btoa to run.
                 /* eslint-disable-next-line global-require */

src/Asset.js

@@ -86,7 +86,7 @@ class BuiltinHelper extends Helper {
      */
     get (assetId) {
         let asset = null;
-        if (this.assets.hasOwnProperty(assetId)) {
+        if (Object.prototype.hasOwnProperty.call(this.assets, assetId)) {
             /** @type{BuiltinAssetRecord} */
             const assetRecord = this.assets[assetId];
             asset = new Asset(assetRecord.type, assetRecord.id, assetRecord.format, assetRecord.data);
@@ -133,7 +133,7 @@ class BuiltinHelper extends Helper {
     _store (assetType, dataFormat, data, id) {
         if (!dataFormat) throw new Error('Data cached without specifying its format');
         if (id !== '' && id !== null && typeof id !== 'undefined') {
-            if (this.assets.hasOwnProperty(id) && assetType.immutable) return id;
+            if (Object.prototype.hasOwnProperty.call(this.assets, id) && assetType.immutable) return id;
         } else if (assetType.immutable) {
             id = md5(data);
         } else {

src/BuiltinHelper.js

@@ -145,7 +145,7 @@ class ScratchStorage {
      * @return {?string} The ID of the default asset of the given type, if any.
      */
     getDefaultAssetId (type) {
-        if (this.defaultAssetId.hasOwnProperty(type.name)) {
+        if (Object.prototype.hasOwnProperty.call(this.defaultAssetId, type.name)) {
             return this.defaultAssetId[type.name];
         }
     }

src/ScratchStorage.js

@@ -149,7 +149,7 @@ class WebHelper extends Helper {
 
         const method = create ? 'post' : 'put';
 
-        if (!store) return Promise.reject('No appropriate stores');
+        if (!store) return Promise.reject(new Error('No appropriate stores'));
 
         let tool = this.assetTool;
         if (assetType.name === 'Project') {

src/WebHelper.js

@@ -32,7 +32,7 @@ class LoggingHelper {
         this.logContainer.push(this.label);
         return this.shouldSucceed ?
             Promise.resolve(new this.storage.Asset(assetType, assetId, dataFormat, Buffer.from(this.label))) :
-            Promise.reject(`This is an expected failure from ${this.label}`);
+            Promise.reject(new Error(`This is an expected failure from ${this.label}`));
     }
 }