fix: when the publicUrl is url not a path of os (#447)

* fix: when the publicUrl is url not a path of os

* remove extra params

* fix

* fix

* add test and change doc

* Simplify urlJoin

Just use URL.parse always, and use posix path joining.

src/utils/urlJoin.js

@@ -1,8 +1,12 @@
-const url = require('url');
+const URL = require('url');
 const path = require('path');
 
+/**
+ * Joins a path onto a URL, and normalizes Windows paths
+ * e.g. from \path\to\res.js to /path/to/res.js.
+ */
 module.exports = function(publicURL, assetPath) {
-  // Use url.resolve to normalize path for windows
-  // from \path\to\res.js to /path/to/res.js
-  return url.resolve(path.join(publicURL, assetPath), '');
+  const url = URL.parse(publicURL);
+  url.pathname = path.posix.join(url.pathname, URL.parse(assetPath).pathname);
+  return URL.format(url);
 };

test/url-join.js

@@ -0,0 +1,67 @@
+const assert = require('assert');
+const urlJoin = require('../src/utils/urlJoin');
+
+describe('Url Join', () => {
+  it('should join a filename with a URL', () => {
+    assert.equal(
+      urlJoin('https://parceljs.org', 'a.js'),
+      'https://parceljs.org/a.js'
+    );
+  });
+
+  it('should join a path with a URL', () => {
+    assert.equal(
+      urlJoin('https://parceljs.org', 'bar/a.js'),
+      'https://parceljs.org/bar/a.js'
+    );
+  });
+
+  it('should join a paths together', () => {
+    assert.equal(
+      urlJoin('https://parceljs.org/foo/', 'bar/a.js'),
+      'https://parceljs.org/foo/bar/a.js'
+    );
+  });
+
+  it('should join an absolute path with a URL', () => {
+    assert.equal(
+      urlJoin('https://parceljs.org/foo/', '/bar/a.js'),
+      'https://parceljs.org/foo/bar/a.js'
+    );
+  });
+
+  it('should join a URL with a querystring', () => {
+    assert.equal(
+      urlJoin('https://parceljs.org/foo?a=123', '/bar/a.js'),
+      'https://parceljs.org/foo/bar/a.js?a=123'
+    );
+
+    assert.equal(
+      urlJoin('https://parceljs.org/foo?a=123&b=456', '/bar/a.js'),
+      'https://parceljs.org/foo/bar/a.js?a=123&b=456'
+    );
+  });
+
+  it('should join a URL with a hash', () => {
+    assert.equal(
+      urlJoin('https://parceljs.org/foo#hello', '/bar/a.js'),
+      'https://parceljs.org/foo/bar/a.js#hello'
+    );
+
+    assert.equal(
+      urlJoin('https://parceljs.org/foo?a=123&b=456#hello', '/bar/a.js'),
+      'https://parceljs.org/foo/bar/a.js?a=123&b=456#hello'
+    );
+  });
+
+  it('should join two paths together', () => {
+    assert.equal(
+      urlJoin('/Users/people/projects/parcel', '/bar/foo.js'),
+      '/Users/people/projects/parcel/bar/foo.js'
+    );
+  });
+
+  it('should support windows paths', () => {
+    assert.equal(urlJoin('dist\\foo', '\\bar\\foo.js'), 'dist/foo/bar/foo.js');
+  });
+});