From 8961432546d8e8b09530810d17c800978fb9ef83 Mon Sep 17 00:00:00 2001 From: ylakhdar Date: Fri, 17 Jan 2025 11:14:55 -0500 Subject: [PATCH] fix(atomic): revert getAssetPath change (#4870) Asset issues started to happen after this change. Reverting them until we have a better solution. https://coveord.atlassian.net/browse/KIT-3870 --- .../atomic/src/components/common/interface/i18n.ts | 2 +- packages/atomic/src/utils/utils.ts | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/atomic/src/components/common/interface/i18n.ts b/packages/atomic/src/components/common/interface/i18n.ts index 8a6825d1bdf..14a87bd3ccd 100644 --- a/packages/atomic/src/components/common/interface/i18n.ts +++ b/packages/atomic/src/components/common/interface/i18n.ts @@ -1,7 +1,7 @@ +import {getAssetPath} from '@stencil/core'; import DOMPurify from 'dompurify'; import Backend, {HttpBackendOptions} from 'i18next-http-backend'; import availableLocales from '../../../generated/availableLocales.json'; -import {getAssetPath} from '../../../utils/utils'; import {AnyEngineType} from './bindings'; import {BaseAtomicInterface} from './interface-common'; diff --git a/packages/atomic/src/utils/utils.ts b/packages/atomic/src/utils/utils.ts index e0521c43a7a..725baf4d2b2 100644 --- a/packages/atomic/src/utils/utils.ts +++ b/packages/atomic/src/utils/utils.ts @@ -1,3 +1,5 @@ +import {getAssetPath} from '@stencil/core'; +import {NODE_TYPES} from '@stencil/core/mock-doc'; import DOMPurify from 'dompurify'; /** @@ -55,11 +57,11 @@ export function parseHTML(string: string) { } export function isElementNode(node: Node): node is Element { - return node.nodeType === Node.ELEMENT_NODE; + return node.nodeType === NODE_TYPES.ELEMENT_NODE; } export function isTextNode(node: Node): node is Text { - return node.nodeType === Node.TEXT_NODE; + return node.nodeType === NODE_TYPES.TEXT_NODE; } export function isVisualNode(node: Node) { @@ -82,12 +84,6 @@ export function containsVisualElement(node: Node) { return false; } -export function getAssetPath(path: string): string { - const baseUrl = window.location.origin; - const assetUrl = new URL(path, baseUrl); - return assetUrl.origin !== baseUrl ? assetUrl.href : assetUrl.pathname; -} - export function parseAssetURL(url: string, assetPath = './assets') { const [, protocol, remainder] = url.match(/^([a-z]+):\/\/(.*?)(\.svg)?$/) || [];