diff --git a/packages/cli/src/extensions/plugins-extensions.ts b/packages/cli/src/extensions/plugins-extensions.ts index de3ceb118..b5ac5934a 100644 --- a/packages/cli/src/extensions/plugins-extensions.ts +++ b/packages/cli/src/extensions/plugins-extensions.ts @@ -60,9 +60,9 @@ module.exports = (toolbox: GluegunToolbox) => { const url = config.indexOf(endpoint) >= 0 ? config - : `${toolbox.normalizeBaseUrl( + : toolbox.normalizeForwardSlashes(`${toolbox.normalizeBaseUrl( toolbox.inputParameters.shopwareEndpoint - )}/${config}`; + )}/${config}`); const pluginsConfigResponse = await axios.get(url); return pluginsConfigResponse.data; }; @@ -74,9 +74,9 @@ module.exports = (toolbox: GluegunToolbox) => { const fileUrl = asset.indexOf(endpoint) >= 0 ? asset - : `${toolbox.normalizeBaseUrl( + : toolbox.normalizeForwardSlashes(`${toolbox.normalizeBaseUrl( toolbox.inputParameters.shopwareEndpoint - )}/${asset}`; + )}/${asset}`); const request = require("request"); const loadFile = function () { diff --git a/packages/cli/src/extensions/shopware-pwa-extension.ts b/packages/cli/src/extensions/shopware-pwa-extension.ts index 262dbc7c8..dd9aed1dc 100644 --- a/packages/cli/src/extensions/shopware-pwa-extension.ts +++ b/packages/cli/src/extensions/shopware-pwa-extension.ts @@ -143,6 +143,16 @@ module.exports = (toolbox: GluegunToolbox) => { return toolbox.strings.trimEnd(baseUrl, "/"); }; + /** + * Removes forward slashes from URLs + * + * @param { string } baseUrl + * @returns { string } + */ + toolbox.normalizeForwardSlashes = (baseUrl: string): string => { + return baseUrl.replace(/([^:]\/)\/+/g, "$1") + }; + /** * Checks if provided API has PWA extension installed * by making a request to the page resolver