refactor: replace js-url with wurl (original version of js-url)

Signed-off-by: BoHong Li <a60814billy@gmail.com>

Author: a60814billy

package.json

@@ -57,7 +57,6 @@
     "jquery-mousewheel": "^3.1.13",
     "jquery-ui": "^1.12.1",
     "js-cookie": "^2.1.3",
-    "js-url": "^2.3.0",
     "js-yaml": "^3.7.0",
     "jsdom-nogyp": "^0.8.3",
     "keymaster": "^1.6.2",
@@ -130,6 +129,7 @@
     "viz.js": "^1.7.0",
     "winston": "^3.1.0",
     "ws": "^6.0.0",
+    "wurl": "^2.5.3",
     "xss": "^1.0.3"
   },
   "resolutions": {

public/js/history.js

@@ -5,6 +5,8 @@ import store from 'store'
 import S from 'string'
 import LZString from 'lz-string'
 
+import wurl from 'wurl'
+
 import {
   checkNoteIdValid,
   encodeNoteId
@@ -23,9 +25,9 @@ window.migrateHistoryFromTempCallback = null
 migrateHistoryFromTemp()
 
 function migrateHistoryFromTemp () {
-  if (window.url('#tempid')) {
+  if (wurl('#tempid')) {
     $.get(`${serverurl}/temp`, {
-      tempid: window.url('#tempid')
+      tempid: wurl('#tempid')
     })
     .done(data => {
       if (data && data.temp) {

public/js/index.js

@@ -20,6 +20,8 @@ import hljs from 'highlight.js'
 
 import _ from 'lodash'
 
+import wurl from 'wurl'
+
 import List from 'list.js'
 
 import Idle from '@hackmd/idle-js'
@@ -1390,12 +1392,12 @@ $('#gistImportModalConfirm').click(function () {
   if (!isValidURL(gisturl)) {
     showMessageModal('<i class="fa fa-github"></i> Import from Gist', 'Not a valid URL :(', '', '', false)
   } else {
-    var hostname = window.url('hostname', gisturl)
+    var hostname = wurl('hostname', gisturl)
     if (hostname !== 'gist.github.com') {
       showMessageModal('<i class="fa fa-github"></i> Import from Gist', 'Not a valid Gist URL :(', '', '', false)
     } else {
       ui.spinner.show()
-      $.get('https://api.github.com/gists/' + window.url('-1', gisturl))
+      $.get('https://api.github.com/gists/' + wurl('-1', gisturl))
                 .done(function (data) {
                   if (data.files) {
                     var contents = ''

webpack.common.js

@@ -195,13 +195,11 @@ module.exports = {
       'bootstrap-validator',
       'expose-loader?select2!select2',
       'expose-loader?moment!moment',
-      'script-loader!js-url',
       path.join(__dirname, 'public/js/cover.js')
     ],
     index: [
       'babel-polyfill',
       'script-loader!jquery-ui-resizable',
-      'script-loader!js-url',
       'expose-loader?LZString!lz-string',
       'script-loader!codemirror',
       'script-loader!inlineAttachment',
@@ -247,7 +245,6 @@ module.exports = {
       'expose-loader?jsyaml!js-yaml',
       'script-loader!mermaid',
       'expose-loader?moment!moment',
-      'script-loader!js-url',
       'script-loader!handlebars',
       'expose-loader?hljs!highlight.js',
       'expose-loader?emojify!emojify.js',