diff --git a/package-lock.json b/package-lock.json index 250b400..d80389f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1813,11 +1813,6 @@ "imurmurhash": "^0.1.4" } }, - "url-join": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz", - "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==" - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index d9b220c..9628ae7 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,7 @@ "ttf2eot": "^3.0.0", "ttf2woff": "^3.0.0", "ttf2woff2": "^6.0.1", - "underscore": "^1.9.1", - "url-join": "^5.0.0" + "underscore": "^1.9.1" }, "devDependencies": { "file-type": "^19.6.0", diff --git a/src/renderCss.js b/src/renderCss.js index 3b9c641..abb25af 100644 --- a/src/renderCss.js +++ b/src/renderCss.js @@ -1,8 +1,8 @@ import * as fs from 'fs' import * as crypto from 'crypto' +import * as url from 'url' import _ from 'underscore' import handlebars from 'handlebars' -import urlJoin from 'url-join' /** Caclulates hash based on options and source SVG files */ var calcHash = function(options) { @@ -24,7 +24,7 @@ var makeUrls = function(options) { var baseUrl = options.cssFontsUrl && options.cssFontsUrl.replace(/\\/g, '/') var urls = _.map(options.types, function(type) { var fontName = options.fontName + '.' + type + '?' + hash - return baseUrl ? urlJoin(baseUrl, fontName) : fontName + return baseUrl ? url.resolve(baseUrl.replace(/\/*$/, '/'), fontName) : fontName }) return _.object(options.types, urls) } diff --git a/yarn.lock b/yarn.lock index 64548d1..e400199 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1397,11 +1397,6 @@ unique-slug@^4.0.0: dependencies: imurmurhash "^0.1.4" -url-join@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-5.0.0.tgz#c2f1e5cbd95fa91082a93b58a1f42fecb4bdbcf1" - integrity sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA== - util-deprecate@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"