Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions __tests__/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,21 @@ test('.uriIsRelative() - "uri" is absolute - should return "false"', () => {
);
});

/**
* .uriIsSchemaLess()
*/

test('.uriIsSchemaLess() - "uri" is schema less - should return "true"', () => {
expect(utils.uriIsSchemaLess('//localhost:700/manifest.json')).toBe(true);
});

test('.uriIsSchemaLess() - "uri" is not schema less - should return "false"', () => {
expect(utils.uriIsSchemaLess('http://localhost:7000/manifest.json')).toBe(
false,
);
});


/**
* .uriRelativeToAbsolute()
*/
Expand Down
4 changes: 2 additions & 2 deletions lib/asset-css.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const { validate } = require('@podium/schemas');
const { uriIsRelative, pathnameBuilder } = require('./utils');
const { uriIsRelative, pathnameBuilder, uriIsSchemaLess } = require('./utils');
const { buildLinkElement, buildReactLinkAttributes } = require('./html-utils');

// Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link
Expand Down Expand Up @@ -93,7 +93,7 @@ const PodiumAssetCss = class PodiumAssetCss {
get value() {
const pathname = this[_prefix] ? this[_pathname] : '';
const value = this[_value];
return uriIsRelative(value) ? pathnameBuilder(pathname, value) : value;
return uriIsRelative(value) && !uriIsSchemaLess(value) ? pathnameBuilder(pathname, value) : value;
}

set value(value) {
Expand Down
4 changes: 2 additions & 2 deletions lib/asset-js.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const { validate } = require('@podium/schemas');
const { uriIsRelative, pathnameBuilder } = require('./utils');
const { uriIsRelative, pathnameBuilder, uriIsSchemaLess } = require('./utils');
const { buildScriptElement, buildReactScriptAttributes } = require('./html-utils');

// Ref: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script
Expand Down Expand Up @@ -94,7 +94,7 @@ const PodiumAssetJs = class PodiumAssetJs {
get value() {
const pathname = this[_prefix] ? this[_pathname] : '';
const value = this[_value];
return uriIsRelative(value) ? pathnameBuilder(pathname, value) : value;
return uriIsRelative(value) && !uriIsSchemaLess(value) ? pathnameBuilder(pathname, value) : value;
}

set value(value) {
Expand Down
12 changes: 12 additions & 0 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,17 @@ const uriBuilder = (input = '', base = '', extra = '') => {

const uriIsRelative = uri => uri.substr(0, 4) !== 'http';


/**
* Checks if a URI is schema less
*
* @param {String} uri A URI to check
*
* @returns {Boolean}
*/

const uriIsSchemaLess = uri => uri.substr(0, 2) === '//';

/**
* Check if a URI is absolute or relative and if relative compose an
* absolute URI out of a absolute mainfest URI.
Expand Down Expand Up @@ -240,6 +251,7 @@ module.exports.isString = isString;
module.exports.isFunction = isFunction;
module.exports.uriBuilder = uriBuilder;
module.exports.uriIsRelative = uriIsRelative;
module.exports.uriIsSchemaLess = uriIsSchemaLess;
module.exports.pathnameBuilder = pathnameBuilder;
module.exports.uriRelativeToAbsolute = uriRelativeToAbsolute;
module.exports.setAtLocalsPodium = setAtLocalsPodium;
Expand Down