Merge pull request #51 from contentstack/bugfix/ie11-node-fetch-error

uttamukkoji · web-flow · commit 5010f37786a2 · 2021-04-16T17:50:59.000+05:30
Bugfix: IE11 node fetch error
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 
+
+### Version: 3.13.1
+#### Date: Apr-16-2021
+##### Bug fix:
+ - IE 11 request method issue resolved
+ 
 ### Version: 3.13.0
-#### Date: 
+#### Date: Apr-05-2021
 
 ##### Update API:
  - [Query]: Added support for method includeEmbeddedItems
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "contentstack",
-  "version": "3.13.0",
+  "version": "3.13.1",
   "description": "Contentstack Javascript SDK",
   "homepage": "https://www.contentstack.com/",
   "author": {
@@ -10,7 +10,7 @@
   "main": "dist/node/contentstack.js",
   "browser": "dist/web/contentstack.js",
   "types": "./index.d.ts",
-  "_id": "contentstack@3.13.0",
+  "_id": "contentstack@3.13.1",
   "scripts": {
     "test": "npm run test:e2e && npm run test:typescript",
     "test:e2e": "istanbul cover tape test/index.js | tap-html --out ./tap-html.html",
@@ -22,7 +22,8 @@
     "buildnativescript": "webpack --config webpack/webpack.nativescript.js",
     "build": "NODE_ENV=production && npm run buildnode && npm run buildweb && npm run buildreactnative && npm run buildnativescript",
     "generate-docs": "node_modules/.bin/jsdoc --configure docs-config.json --verbose",
-    "prepare": "npm run build"
+    "prepare": "npm run build",
+    "pretest": "npm run build"
   },
   "repository": {
     "type": "git",
@@ -53,14 +54,14 @@
   ],
   "dist": {
     "shasum": "a328ed07240476a26b31a23261355dc929e1da63",
-    "tarball": "https://registry.npmjs.org/contentstack/-/contentstack-3.13.0.tgz"
+    "tarball": "https://registry.npmjs.org/contentstack/-/contentstack-3.13.1.tgz"
   },
   "license": "MIT",
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/contentstack/-/contentstack-3.13.0.tgz",
+  "_resolved": "https://registry.npmjs.org/contentstack/-/contentstack-3.13.1.tgz",
   "_npmOperationalInternal": {
     "host": "packages-18-east.internal.npmjs.com",
-    "tmp": "tmp/contentstack-3.13.0.tgz_1477830884275_0.9869455888401717"
+    "tmp": "tmp/contentstack-3.13.1.tgz_1477830884275_0.9869455888401717"
   },
   "devDependencies": {
     "@types/jest": "^26.0.13",
@@ -99,7 +100,7 @@
   "dependencies": {
     "@contentstack/utils": "1.0.0",
     "es6-promise": "4.1.1",
-    "localStorage": "1.0.3",
-    "node-fetch": "^2.6.1"
+    "isomorphic-fetch": "^3.0.0",
+    "localStorage": "1.0.3"
   }
 }
diff --git a/src/core/lib/request.js b/src/core/lib/request.js
@@ -61,7 +61,7 @@ async function safeParseJSON(response) {
     const body = await response.text();
 }
 function fetchRetry(url, headers, retryDelay = 300, retryLimit = 5, fetchOptions, resolve, reject) {
-    var option = Object.assign({ 
+    var option = Utils.mergeDeep({ 
         method: 'GET',
         headers: headers,
         timeout: 30000,                                
diff --git a/src/core/lib/utils.js b/src/core/lib/utils.js
@@ -238,9 +238,7 @@ export function sendRequest(queryObject, options) {
     let tojson = (typeof self.tojson !== 'undefined') ? self.tojson : false;
     let isSingle = (self.entry_uid || self.singleEntry || self.asset_uid) ? true : false;
     let hashQuery = getHash(parseQueryFromParams(self, isSingle, tojson));
-    if (queryObject.requestParams.url.includes(config.urls.sync)) {
-        cachePolicy = -1;
-    }
+
     /**
     for new api v3
     */
diff --git a/src/core/modules/assets.js b/src/core/modules/assets.js
@@ -118,7 +118,7 @@ export default class Assets {
                     query: this._query
                 }
             }
-            var options = Object.assign({}, this.fetchOptions, fetchOptions);
+            var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);
             return Utils.sendRequest(this, options);
         } else {
             console.error("Kindly provide an asset uid. e.g. .Assets('bltsomething123')");
diff --git a/src/core/modules/entry.js b/src/core/modules/entry.js
@@ -341,7 +341,7 @@ export default class Entry {
                     query: this._query
                 }
             };
-            var options = Object.assign({}, this.fetchOptions, fetchOptions);
+            var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);
             return Utils.sendRequest(this, options);
         } else {
             console.error("Kindly provide an entry uid. e.g. .Entry('bltsomething123')");
diff --git a/src/core/modules/query.js b/src/core/modules/query.js
@@ -757,7 +757,7 @@ export default class Query extends Entry {
                 query: this._query
             }
         };
-        var options = Object.assign({}, this.fetchOptions, fetchOptions);
+        var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);
         return Utils.sendRequest(this, options);
     }
 
@@ -790,7 +790,7 @@ export default class Query extends Entry {
                 query: this._query
             }
         };
-        var options = Object.assign({}, this.fetchOptions);
+        var options = Utils.mergeDeep({}, this.fetchOptions);
         return Utils.sendRequest(this, options);
     }
 
diff --git a/src/core/stack.js b/src/core/stack.js
@@ -57,14 +57,14 @@ export default class Stack {
                 return false
             }
          };
-        this.config = Object.assign({}, config)
+        this.config = Utils.mergeDeep({}, config)
 
         if(stack_arguments[0].region && stack_arguments[0].region !== undefined && stack_arguments[0].region !== "us") {
             this.config['host'] = stack_arguments[0].region+"-"+"cdn.contentstack.com";
         } 
 
         if (stack_arguments[0].fetchOptions && stack_arguments[0].fetchOptions !== undefined) {
-            this.fetchOptions =  Object.assign(this.fetchOptions, stack_arguments[0].fetchOptions);
+            this.fetchOptions =  Utils.mergeDeep(this.fetchOptions, stack_arguments[0].fetchOptions);
         }
         
         this.cachePolicy = CacheProvider.policies.IGNORE_CACHE;
@@ -107,7 +107,7 @@ export default class Stack {
                     if(typeof stack_arguments[3] === "string" && stack_arguments[3] !== undefined && stack_arguments[3] !== "us") {
                         this.config['host'] = stack_arguments[3]+"-"+"cdn.contentstack.com";
                     } else if (typeof stack_arguments[3] === 'object') {
-                        this.fetchOptions = Object.assign(this.fetchOptions, stack_arguments[3]);
+                        this.fetchOptions = Utils.mergeDeep(this.fetchOptions, stack_arguments[3]);
                     }
                 }
                 return this;
@@ -126,11 +126,11 @@ export default class Stack {
                     if(typeof stack_arguments[3] === "string" && stack_arguments[3] !== undefined && stack_arguments[3] !== "us") {
                         this.config['host'] = stack_arguments[3]+"-"+"cdn.contentstack.com";
                     } else if (typeof stack_arguments[3] === 'object') {
-                        this.fetchOptions = Object.assign(this.fetchOptions, stack_arguments[3]);
+                        this.fetchOptions = Utils.mergeDeep(this.fetchOptions, stack_arguments[3]);
                     }
                 }
                 if (stack_arguments[4] && typeof stack_arguments[4] === 'object') {
-                    this.fetchOptions = Object.assign(this.fetchOptions, stack_arguments[4]);
+                    this.fetchOptions = Utils.mergeDeep(this.fetchOptions, stack_arguments[4]);
                 }
                 return this;
             default:
@@ -353,7 +353,7 @@ export default class Stack {
                 environment: this.environment
             }
         };
-        var options = Object.assign({}, this.fetchOptions, fetchOptions);
+        var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);
         return Request(result, options);
     }
 
@@ -497,7 +497,7 @@ export default class Stack {
 
     sync(params, fetchOptions) {
         this._query = {};
-        this._query = Object.assign(this._query, params);
+        this._query = Utils.mergeDeep(this._query, params);
         this.requestParams = {
             method: 'POST',
             headers: this.headers,
@@ -507,7 +507,7 @@ export default class Stack {
                 query: this._query
             }
         }
-        var options = Object.assign({}, this.fetchOptions, fetchOptions);
+        var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);
         return Utils.sendRequest(this, options);
     }
 
diff --git a/src/runtime/web/http.js b/src/runtime/web/http.js
@@ -1,6 +1,5 @@
 import ES6Promise from 'es6-promise';
-import fetch from 'node-fetch';
-
+import fetch from 'isomorphic-fetch';
 ES6Promise.polyfill();
 
 export default fetch;
diff --git a/src/runtime/web/localstorage.js b/src/runtime/web/localstorage.js
@@ -1,16 +1,16 @@
-// export default window.localStorage;
+export default window.localStorage;
 
-let webLocalStoreage = function (){
-    try {
-        var storage = window.localStorage
-        // x = '__storage_test__';
-        // storage.setItem(x, x);
-        // storage.removeItem(x);
-        return storage;
-    } catch(e) {
-        return null
-    }
-};
+// let webLocalStoreage = function (){
+//     try {
+//         var storage = window.localStorage
+//         // x = '__storage_test__';
+//         // storage.setItem(x, x);
+//         // storage.removeItem(x);
+//         return storage;
+//     } catch(e) {
+//         return null
+//     }
+// };
 
-export default webLocalStoreage();
+// export default webLocalStoreage();
     

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ async function safeParseJSON(response) {`
`61`	`61`	`const body = await response.text();`
`62`	`62`	`}`
`63`	`63`	`function fetchRetry(url, headers, retryDelay = 300, retryLimit = 5, fetchOptions, resolve, reject) {`
`64`		`- var option = Object.assign({`
	`64`	`+ var option = Utils.mergeDeep({`
`65`	`65`	`method: 'GET',`
`66`	`66`	`headers: headers,`
`67`	`67`	`timeout: 30000,`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ export default class Assets {`
`118`	`118`	`query: this._query`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`- var options = Object.assign({}, this.fetchOptions, fetchOptions);`
	`121`	`+ var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);`
`122`	`122`	`return Utils.sendRequest(this, options);`
`123`	`123`	`} else {`
`124`	`124`	`console.error("Kindly provide an asset uid. e.g. .Assets('bltsomething123')");`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ export default class Entry {`
`341`	`341`	`query: this._query`
`342`	`342`	`}`
`343`	`343`	`};`
`344`		`- var options = Object.assign({}, this.fetchOptions, fetchOptions);`
	`344`	`+ var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);`
`345`	`345`	`return Utils.sendRequest(this, options);`
`346`	`346`	`} else {`
`347`	`347`	`console.error("Kindly provide an entry uid. e.g. .Entry('bltsomething123')");`
Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ export default class Query extends Entry {`
`757`	`757`	`query: this._query`
`758`	`758`	`}`
`759`	`759`	`};`
`760`		`- var options = Object.assign({}, this.fetchOptions, fetchOptions);`
	`760`	`+ var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);`
`761`	`761`	`return Utils.sendRequest(this, options);`
`762`	`762`	`}`
`763`	`763`
`@@ -790,7 +790,7 @@ export default class Query extends Entry {`
`790`	`790`	`query: this._query`
`791`	`791`	`}`
`792`	`792`	`};`
`793`		`- var options = Object.assign({}, this.fetchOptions);`
	`793`	`+ var options = Utils.mergeDeep({}, this.fetchOptions);`
`794`	`794`	`return Utils.sendRequest(this, options);`
`795`	`795`	`}`
`796`	`796`
Original file line number	Diff line number	Diff line change
`@@ -57,14 +57,14 @@ export default class Stack {`
`57`	`57`	`return false`
`58`	`58`	`}`
`59`	`59`	`};`
`60`		`- this.config = Object.assign({}, config)`
	`60`	`+ this.config = Utils.mergeDeep({}, config)`
`61`	`61`
`62`	`62`	`if(stack_arguments[0].region && stack_arguments[0].region !== undefined && stack_arguments[0].region !== "us") {`
`63`	`63`	`this.config['host'] = stack_arguments[0].region+"-"+"cdn.contentstack.com";`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if (stack_arguments[0].fetchOptions && stack_arguments[0].fetchOptions !== undefined) {`
`67`		`- this.fetchOptions = Object.assign(this.fetchOptions, stack_arguments[0].fetchOptions);`
	`67`	`+ this.fetchOptions = Utils.mergeDeep(this.fetchOptions, stack_arguments[0].fetchOptions);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`this.cachePolicy = CacheProvider.policies.IGNORE_CACHE;`
`@@ -107,7 +107,7 @@ export default class Stack {`
`107`	`107`	`if(typeof stack_arguments[3] === "string" && stack_arguments[3] !== undefined && stack_arguments[3] !== "us") {`
`108`	`108`	`this.config['host'] = stack_arguments[3]+"-"+"cdn.contentstack.com";`
`109`	`109`	`} else if (typeof stack_arguments[3] === 'object') {`
`110`		`- this.fetchOptions = Object.assign(this.fetchOptions, stack_arguments[3]);`
	`110`	`+ this.fetchOptions = Utils.mergeDeep(this.fetchOptions, stack_arguments[3]);`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`return this;`
`@@ -126,11 +126,11 @@ export default class Stack {`
`126`	`126`	`if(typeof stack_arguments[3] === "string" && stack_arguments[3] !== undefined && stack_arguments[3] !== "us") {`
`127`	`127`	`this.config['host'] = stack_arguments[3]+"-"+"cdn.contentstack.com";`
`128`	`128`	`} else if (typeof stack_arguments[3] === 'object') {`
`129`		`- this.fetchOptions = Object.assign(this.fetchOptions, stack_arguments[3]);`
	`129`	`+ this.fetchOptions = Utils.mergeDeep(this.fetchOptions, stack_arguments[3]);`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`if (stack_arguments[4] && typeof stack_arguments[4] === 'object') {`
`133`		`- this.fetchOptions = Object.assign(this.fetchOptions, stack_arguments[4]);`
	`133`	`+ this.fetchOptions = Utils.mergeDeep(this.fetchOptions, stack_arguments[4]);`
`134`	`134`	`}`
`135`	`135`	`return this;`
`136`	`136`	`default:`
`@@ -353,7 +353,7 @@ export default class Stack {`
`353`	`353`	`environment: this.environment`
`354`	`354`	`}`
`355`	`355`	`};`
`356`		`- var options = Object.assign({}, this.fetchOptions, fetchOptions);`
	`356`	`+ var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);`
`357`	`357`	`return Request(result, options);`
`358`	`358`	`}`
`359`	`359`
`@@ -497,7 +497,7 @@ export default class Stack {`
`497`	`497`
`498`	`498`	`sync(params, fetchOptions) {`
`499`	`499`	`this._query = {};`
`500`		`- this._query = Object.assign(this._query, params);`
	`500`	`+ this._query = Utils.mergeDeep(this._query, params);`
`501`	`501`	`this.requestParams = {`
`502`	`502`	`method: 'POST',`
`503`	`503`	`headers: this.headers,`
`@@ -507,7 +507,7 @@ export default class Stack {`
`507`	`507`	`query: this._query`
`508`	`508`	`}`
`509`	`509`	`}`
`510`		`- var options = Object.assign({}, this.fetchOptions, fetchOptions);`
	`510`	`+ var options = Utils.mergeDeep({}, this.fetchOptions, fetchOptions);`
`511`	`511`	`return Utils.sendRequest(this, options);`
`512`	`512`	`}`
`513`	`513`