[GitHub] Antonio-Maranhao closed pull request #1076: url-polyfill name update breaks fauxton build

[GitBox <gi...@apache.org>]

Antonio-Maranhao closed pull request #1076: url-polyfill name update breaks fauxton build
URL: https://github.com/apache/couchdb-fauxton/pull/1076
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/app/addons/documents/index-results/api.js b/app/addons/documents/index-results/api.js
index 70652382e..5f35a488e 100644
--- a/app/addons/documents/index-results/api.js
+++ b/app/addons/documents/index-results/api.js
@@ -10,7 +10,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-import 'url-polyfill';
+import '@webcomponents/url';
 import 'whatwg-fetch';
 import app from '../../../app';
 import Constants from '../constants';
diff --git a/app/addons/replication/api.js b/app/addons/replication/api.js
index 723f39653..2e2406437 100644
--- a/app/addons/replication/api.js
+++ b/app/addons/replication/api.js
@@ -10,7 +10,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-import 'url-polyfill';
+import '@webcomponents/url';
 import Constants from './constants';
 import FauxtonAPI from '../../core/api';
 import {get, post, put} from '../../core/ajax';
diff --git a/package-lock.json b/package-lock.json
index 5a0a13012..39fe084bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -125,6 +125,9 @@
       "integrity": "sha512-KA4GKOpgXnrqEH2eCVhiv2CsxgXGQJgV1X0vsGlh+WCnxbeAE1GT44ZsTU1IN5dEeV/gDupKa7gWo08V5IxWVQ==",
       "dev": true
     },
+    "@webcomponents/url": {
+      "version": "git+https://github.com/webcomponents/URL.git#21758445ee1aaf8df372fb103bf32d30c6c912ab"
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -19806,9 +19809,6 @@
         }
       }
     },
-    "url-polyfill": {
-      "version": "git+https://github.com/webcomponents/URL.git#812ca9b2baae653290aceb36362d219cb96c0f35"
-    },
     "urls": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/urls/-/urls-0.0.4.tgz",
diff --git a/package.json b/package.json
index 8162af3f5..398cd60cc 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "underscore": "~1.4.2",
     "url": "~0.7.9",
     "url-loader": "^0.5.7",
-    "url-polyfill": "git+https://github.com/webcomponents/URL.git",
+    "@webcomponents/url": "git+https://github.com/webcomponents/URL.git",
     "urls": "~0.0.3",
     "uuid": "^3.0.1",
     "visualizeRevTree": "git+https://github.com/neojski/visualizeRevTree.git#gh-pages",


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services