From da7e983ad260c7ea274d59e9fd206bef1a7ee180 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 5 Apr 2022 18:52:59 -0500 Subject: [PATCH] yarn: drop navigator.locks patch The fix was merged upstream. --- ...navigator.locks-npm-0.8.1-e8530a2d4f.patch | 44 ------------------- package.json | 5 +-- yarn.lock | 17 +++---- 3 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 .yarn/patches/navigator.locks-npm-0.8.1-e8530a2d4f.patch diff --git a/.yarn/patches/navigator.locks-npm-0.8.1-e8530a2d4f.patch b/.yarn/patches/navigator.locks-npm-0.8.1-e8530a2d4f.patch deleted file mode 100644 index cbe94aca..00000000 --- a/.yarn/patches/navigator.locks-npm-0.8.1-e8530a2d4f.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/dist/index.cjs.js b/dist/index.cjs.js -index 7beac7aabaa8b0b99ac58df5bc7c60e7ad266ab2..1bbb7c4a3319cfd10a4939da578cf96a473ab43d 100644 ---- a/dist/index.cjs.js -+++ b/dist/index.cjs.js -@@ -12,4 +12,4 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --***************************************************************************** */var e=function(){return(e=Object.assign||function(e){for(var t,n=1,o=arguments.length;n0&&r[r.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!r||i[1]>r[0]&&i[1]0)&&!(o=i.next()).done;)u.push(o.value)}catch(e){r={error:e}}finally{try{o&&!o.done&&(n=i.return)&&n.call(i)}finally{if(r)throw r.error}}return u}function r(e,t){for(var n=0,o=t.length,r=e.length;n3100?(o=t,window.localStorage.removeItem(o),e._cleanClientLocksByClientId(t)):n.push(t)})),JSON.stringify(t)!==JSON.stringify(n)&&this._storeClientIds(n)}else this._storeClientIds([])},h}();!function(){if("undefined"!=typeof window){var e=window.navigator;if(e&&!e.locks){var t=new h;Object.defineProperty(e,"locks",{value:t})}}}(); -+***************************************************************************** */var e=function(){return(e=Object.assign||function(e){for(var t,n=1,o=arguments.length;n0&&r[r.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!r||i[1]>r[0]&&i[1]0)&&!(o=i.next()).done;)u.push(o.value)}catch(e){r={error:e}}finally{try{o&&!o.done&&(n=i.return)&&n.call(i)}finally{if(r)throw r.error}}return u}function r(e,t){for(var n=0,o=t.length,r=e.length;n3100?(o=t,window.localStorage.removeItem(o),e._cleanClientLocksByClientId(t)):n.push(t)})),JSON.stringify(t)!==JSON.stringify(n)&&this._storeClientIds(n)}else this._storeClientIds([])},h}();!function(){if("undefined"!=typeof window){var e=window.navigator;if(e&&!e.locks){var t=new h;Object.defineProperty(e,"locks",{value:t})}}}(); -diff --git a/dist/index.umd.js b/dist/index.umd.js -index 3e4b1b1191ea32beb5a07c1f2663cfd20847454c..5ab7e84ae25258f245ffe303f084801ad92198a0 100644 ---- a/dist/index.umd.js -+++ b/dist/index.umd.js -@@ -12,4 +12,4 @@ - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. -- ***************************************************************************** */var e=function(){return(e=Object.assign||function(e){for(var t,n=1,o=arguments.length;n0&&r[r.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!r||i[1]>r[0]&&i[1]0)&&!(o=i.next()).done;)u.push(o.value)}catch(e){r={error:e}}finally{try{o&&!o.done&&(n=i.return)&&n.call(i)}finally{if(r)throw r.error}}return u}function r(e,t){for(var n=0,o=t.length,r=e.length;n3100?(o=t,window.localStorage.removeItem(o),e._cleanClientLocksByClientId(t)):n.push(t)})),JSON.stringify(t)!==JSON.stringify(n)&&this._storeClientIds(n)}else this._storeClientIds([])},h}();!function(){if("undefined"!=typeof window){var e=window.navigator;if(e&&!e.locks){var t=new h;Object.defineProperty(e,"locks",{value:t})}}}()})); -+ ***************************************************************************** */var e=function(){return(e=Object.assign||function(e){for(var t,n=1,o=arguments.length;n0&&r[r.length-1])||6!==i[0]&&2!==i[0])){u=0;continue}if(3===i[0]&&(!r||i[1]>r[0]&&i[1]0)&&!(o=i.next()).done;)u.push(o.value)}catch(e){r={error:e}}finally{try{o&&!o.done&&(n=i.return)&&n.call(i)}finally{if(r)throw r.error}}return u}function r(e,t){for(var n=0,o=t.length,r=e.length;n3100?(o=t,window.localStorage.removeItem(o),e._cleanClientLocksByClientId(t)):n.push(t)})),JSON.stringify(t)!==JSON.stringify(n)&&this._storeClientIds(n)}else this._storeClientIds([])},h}();!function(){if("undefined"!=typeof window){var e=window.navigator;if(e&&!e.locks){var t=new h;Object.defineProperty(e,"locks",{value:t})}}}()})); -diff --git a/dist/polyfill.js b/dist/polyfill.js -index d0ae9f6091414c36f1a54f7ef2932875f98fe336..50fa34bfaca52174d0a2191b94bffd3066b9a54a 100644 ---- a/dist/polyfill.js -+++ b/dist/polyfill.js -@@ -363,6 +363,7 @@ var LockManager = /** @class */ (function () { - return [3 /*break*/, 3]; - case 2: - error_1 = _a.sent(); -+ _resolve(error_1); - reject(error_1); - return [3 /*break*/, 3]; - case 3: return [2 /*return*/]; -diff --git a/src/polyfill.ts b/src/polyfill.ts -index 72874e7ee19864eb3768dfe56a6a11ad1e0a3ae3..438e45387123c85c62e7209348d9073372106ae7 100644 ---- a/src/polyfill.ts -+++ b/src/polyfill.ts -@@ -421,6 +421,7 @@ export class LockManager { - _resolve(res); - resolve(res); - } catch (error) { -+ _resolve(error); - reject(error); - } - }); diff --git a/package.json b/package.json index 4f6d69dc..ed6b3a5c 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "monaco-editor-webpack-plugin": "^6.0.0", "monaco-themes": "^0.4.0", "mq-polyfill": "1.1.8", - "navigator.locks": "0.8.1", + "navigator.locks": "^0.8.5", "node-sass": "^6.0.1", "prop-types": "^15.8.1", "react": "^16.13.1", @@ -110,7 +110,6 @@ "packageManager": "yarn@3.2.0", "resolutions": { "mq-polyfill@1.1.8": "patch:mq-polyfill@npm:1.1.8#.yarn/patches/mq-polyfill-npm-1.1.8-62fe162439.patch", - "react-error-overlay": "6.0.9", - "navigator.locks@0.8.1": "patch:navigator.locks@npm:0.8.1#.yarn/patches/navigator.locks-npm-0.8.1-e8530a2d4f.patch" + "react-error-overlay": "6.0.9" } } diff --git a/yarn.lock b/yarn.lock index be48bc96..ba4d3802 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2150,7 +2150,7 @@ __metadata: monaco-editor-webpack-plugin: ^6.0.0 monaco-themes: ^0.4.0 mq-polyfill: 1.1.8 - navigator.locks: 0.8.1 + navigator.locks: ^0.8.5 node-sass: ^6.0.1 prettier: ^2.5.1 prop-types: ^15.8.1 @@ -11409,17 +11409,10 @@ __metadata: languageName: node linkType: hard -"navigator.locks@npm:0.8.1": - version: 0.8.1 - resolution: "navigator.locks@npm:0.8.1" - checksum: 15438f3500839f91fb9fb516e35436263847182a9bf593581a5aa0f50f744b0b62957d5cf54556f733692318dd9f774ca99a40e7babe7fef2b436b8ef82fb9ca - languageName: node - linkType: hard - -"navigator.locks@patch:navigator.locks@npm:0.8.1#.yarn/patches/navigator.locks-npm-0.8.1-e8530a2d4f.patch::locator=%40pybricks%2Fpybricks-code%40workspace%3A.": - version: 0.8.1 - resolution: "navigator.locks@patch:navigator.locks@npm%3A0.8.1#.yarn/patches/navigator.locks-npm-0.8.1-e8530a2d4f.patch::version=0.8.1&hash=cb7184&locator=%40pybricks%2Fpybricks-code%40workspace%3A." - checksum: a4ce9fa068d07874234f11849dccc4bc265ce9baa468aea29a3734bc672be893cd6e9d1c91320b898fbe011d0c3ce8d55fb7af8ed4295f9d67feda65697f2bbe +"navigator.locks@npm:^0.8.5": + version: 0.8.5 + resolution: "navigator.locks@npm:0.8.5" + checksum: fab379c6dfb49faf4aaa064e98050feadc8023eab22fa96df91f15db35234a978d4ad6a23cdfa1a8a9a6d8acd4c43864bde3a454cfc1c77739e318464f9a44e6 languageName: node linkType: hard