@tryghost/url-utils 3.0.1 → 4.0.2

package/lib/url-utils.js

@@ -70,15 +70,14 @@ module.exports = class UrlUtils {
     // Parameters:
     // - urlPath - string which must start and end with a slash
     // - absolute (optional, default:false) - boolean whether or not the url should be absolute
-    // - secure (optional, default:false) - boolean whether or not to force SSL
     // Returns:
     //  - a URL which always ends with a slash
-    createUrl(urlPath = '/', absolute = false, secure, trailingSlash) {
+    createUrl(urlPath = '/', absolute = false, trailingSlash) {
         let base;
 
         // create base of url, always ends without a slash
         if (absolute) {
-            base = this.getSiteUrl(secure);
+            base = this.getSiteUrl();
         } else {
             base = this.getSubdir();
         }
@@ -109,7 +108,6 @@ module.exports = class UrlUtils {
     // @TODO: rewrite, very hard to read, create private functions!
     urlFor(context, data, absolute) {
         let urlPath = '/';
-        let secure;
         let imagePathRe;
         let knownObjects = ['image', 'nav'];
         let baseUrl;
@@ -127,9 +125,6 @@ module.exports = class UrlUtils {
             data = null;
         }
 
-        // Can pass 'secure' flag in either context or data arg
-        secure = (context && context.secure) || (data && data.secure);
-
         if (_.isObject(context) && context.relativeUrl) {
             urlPath = context.relativeUrl;
         } else if (_.isString(context) && _.indexOf(knownObjects, context) !== -1) {
@@ -141,15 +136,14 @@ module.exports = class UrlUtils {
                 if (absolute) {
                     // Remove the sub-directory from the URL because ghostConfig will add it back.
                     urlPath = urlPath.replace(new RegExp('^' + this.getSubdir()), '');
-                    baseUrl = this.getSiteUrl(secure).replace(/\/$/, '');
+                    baseUrl = this.getSiteUrl().replace(/\/$/, '');
                     urlPath = baseUrl + urlPath;
                 }
 
                 return urlPath;
             } else if (context === 'nav' && data.nav) {
                 urlPath = data.nav.url;
-                secure = data.nav.secure || secure;
-                baseUrl = this.getSiteUrl(secure);
+                baseUrl = this.getSiteUrl();
                 hostname = baseUrl.split('//')[1];
 
                 // If the hostname is present in the url
@@ -165,7 +159,7 @@ module.exports = class UrlUtils {
                 }
             }
         } else if (context === 'home' && absolute) {
-            urlPath = this.getSiteUrl(secure);
+            urlPath = this.getSiteUrl();
 
             // CASE: there are cases where urlFor('home') needs to be returned without trailing
             // slash e. g. the `{{@site.url}}` helper. See https://github.com/TryGhost/Ghost/issues/8569
@@ -210,7 +204,7 @@ module.exports = class UrlUtils {
             return urlPath;
         }
 
-        return this.createUrl(urlPath, absolute, secure);
+        return this.createUrl(urlPath, absolute);
     }
 
     redirect301(res, redirectUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/url-utils",
-  "version": "3.0.1",
+  "version": "4.0.2",
   "repository": "https://github.com/TryGhost/SDK/tree/master/packages/url-utils",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -19,8 +19,8 @@
     "access": "public"
   },
   "devDependencies": {
-    "@tryghost/config-url-helpers": "0.1.8",
-    "c8": "7.11.2",
+    "@tryghost/config-url-helpers": "1.0.1",
+    "c8": "7.11.3",
     "mocha": "10.0.0",
     "rewire": "6.0.0",
     "should": "13.2.3",
@@ -34,5 +34,5 @@
     "remark-footnotes": "^1.0.0",
     "unist-util-visit": "^2.0.0"
   },
-  "gitHead": "2f7fb1fef3f2464f000974c8e0e13e25eabd6f6d"
+  "gitHead": "f5a8a2c81a4afc3640f922ef221ea1b6ddfa216a"
 }