@tryghost/url-utils 2.0.6 → 2.1.0

package/lib/index.js

@@ -19,12 +19,12 @@ module.exports = class UrlUtils {
      * @param {Function} options.getSiteUrl
      * @param {Function} options.getAdminUrl Ghost instance admin URL
      * @param {Object} options.apiVersions configuration object which has defined `all` property which is an array of keys for other available properties
-     * @param {('v2' | 'v3' | 'v4' | 'canary')} [options.defaultApiVersion] default API version which is one of the values from options.apiVersions
-     * @param {('content' | 'admin')} [options.defaultApiType] default API type to be used and is one of the values from options.apiVersions
+     * @param {('v2' | 'v3' | 'v4' | 'canary')} [options.defaultApiVersion='v4'] default API version which is one of the values from options.apiVersions
+     * @param {('content' | 'admin')} [options.defaultApiType='content'] default API type to be used and is one of the values from options.apiVersions
      * @param {Object} [options.slugs] object with 2 properties reserved and protected containing arrays of special case slugs
      * @param {Number} [options.redirectCacheMaxAge]
-     * @param {String} [options.baseApiPath] static prefix for serving API. Should not te passed in, unless the API is being run under custom URL
-     * @param {String} [options.staticImageUrlPrefix] static prefix for serving images. Should not be passed in, unless customizing ghost instance image storage
+     * @param {String} [options.baseApiPath='/ghost/api'] static prefix for serving API. Should not te passed in, unless the API is being run under custom URL
+     * @param {String} [options.staticImageUrlPrefix='content/images'] static prefix for serving images. Should not be passed in, unless customizing ghost instance image storage
      */
     constructor(options = {}) {
         const defaultOptions = {

package/lib/utils/_html-transform.js

@@ -8,6 +8,18 @@ function extractSrcsetUrls(srcset = '') {
     });
 }
 
+function extractStyleUrls(style = '') {
+    const urls = [];
+    const regex = /url\(['|"]([^)]+)['|"]\)/g;
+    let match;
+
+    while ((match = regex.exec(style)) !== null) {
+        urls.push(match[1]);
+    }
+
+    return urls;
+}
+
 function htmlTransform(html = '', siteUrl, transformFunction, itemPath, _options) {
     const defaultOptions = {assetsOnly: false, secure: false};
     const options = Object.assign({}, defaultOptions, _options || {});
@@ -42,7 +54,7 @@ function htmlTransform(html = '', siteUrl, transformFunction, itemPath, _options
     }
 
     // find all of the relative url attributes that we care about
-    ['href', 'src', 'srcset'].forEach((attributeName) => {
+    ['href', 'src', 'srcset', 'style'].forEach((attributeName) => {
         htmlContent('[' + attributeName + ']').each((ix, el) => {
             // ignore <stream> elems and html inside of <code> elements
             if (el.name === 'stream' || htmlContent(el).closest('code').length) {
@@ -57,8 +69,14 @@ function htmlTransform(html = '', siteUrl, transformFunction, itemPath, _options
             el = htmlContent(el);
             const originalValue = el.attr(attributeName);
 
-            if (attributeName === 'srcset') {
-                const urls = extractSrcsetUrls(originalValue);
+            if (attributeName === 'srcset' || attributeName === 'style') {
+                let urls;
+
+                if (attributeName === 'srcset') {
+                    urls = extractSrcsetUrls(originalValue);
+                } else {
+                    urls = extractStyleUrls(originalValue);
+                }
                 const absoluteUrls = urls.map(url => transformFunction(url, siteUrl, itemPath, options));
                 let transformedValue = originalValue;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/url-utils",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "repository": "https://github.com/TryGhost/SDK/tree/master/packages/url-utils",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@tryghost/config-url-helpers": "0.1.4",
+    "@tryghost/config-url-helpers": "0.1.5",
     "c8": "7.11.0",
     "mocha": "7.2.0",
     "rewire": "5.0.0",
@@ -33,5 +33,5 @@
     "remark-footnotes": "^1.0.0",
     "unist-util-visit": "^2.0.0"
   },
-  "gitHead": "f8813610f5ba4eed4fbcbd025eddf78795fd8aab"
+  "gitHead": "8bfb11a7576f3a09aa2a4d633933bb8f341d9329"
 }