Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MWPW-152082 - Utils to Scripts #209

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 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
4 changes: 2 additions & 2 deletions blocks/comparison/comparison.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { getLibs } from '../../scripts/utils.js';
import { LIBS } from '../../scripts/scripts.js';

/**
* @param {Element} el
*/
const init = async (el) => {
const { createTag } = await import(`${getLibs()}/utils/utils.js`);
const { createTag } = await import(`${LIBS}/utils/utils.js`);
const rows = Array.from(el.querySelectorAll(':scope > div'));
const headers = Array.from(rows.shift().children);
const headersRow = createTag('tr');
Expand Down
4 changes: 2 additions & 2 deletions blocks/faas-decode/faas-decode.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getLibs } from '../../scripts/utils.js';
import { LIBS } from '../../scripts/scripts.js';

export default async function init(el) {
const { createTag, parseEncodedConfig } = await import(`${getLibs()}/utils/utils.js`);
const { createTag, parseEncodedConfig } = await import(`${LIBS}/utils/utils.js`);
const url = el.querySelector('a')?.href;
const resp = await fetch(url);

Expand Down
6 changes: 3 additions & 3 deletions blocks/redirects-formatter/redirects-formatter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getLibs } from '../../scripts/utils.js';
import { LIBS } from '../../scripts/scripts.js';

export const SELECT_ALL_REGIONS = 'Select All Regions';
export const DESELECT_ALL_REGIONS = 'De-select All Regions';
Expand All @@ -12,7 +12,7 @@ const INSTRUCTIONS_TEXT = 'Select the locales you require by checking the checkb
+ ' press "Copy to clipboard" or select them with the cursor manually.';

async function createLocaleCheckboxes(prefixGroup) {
const { createTag } = await import(`${getLibs()}/utils/utils.js`);
const { createTag } = await import(`${LIBS}/utils/utils.js`);

return Object.keys(prefixGroup).map((key) => {
const { prefix } = prefixGroup[key];
Expand Down Expand Up @@ -87,7 +87,7 @@ export function stringifyListForExcel(urls) {
}

export default async function init(el) {
const { createTag } = await import(`${getLibs()}/utils/utils.js`);
const { createTag } = await import(`${LIBS}/utils/utils.js`);
const xlPath = './locale-config.json';
const resp = await fetch(xlPath);
if (!resp.ok) return;
Expand Down
6 changes: 3 additions & 3 deletions blocks/stats/stats.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getLibs } from '../../scripts/utils.js';
import { LIBS } from '../../scripts/scripts.js';

async function decorateRow(row, module) {
const { decorateLinkAnalytics } = module;
Expand All @@ -14,8 +14,8 @@ async function decorateRow(row, module) {
}

export default async function init(el) {
const { createTag } = await import(`${getLibs()}/utils/utils.js`);
const module = await import(`${getLibs()}/martech/attributes.js`);
const { createTag } = await import(`${LIBS}/utils/utils.js`);
const module = await import(`${LIBS}/martech/attributes.js`);

module.decorateBlockAnalytics(el);
const firstRow = el.querySelector(':scope > div');
Expand Down
4 changes: 2 additions & 2 deletions blocks/tree-view/tree-view.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getLibs } from '../../scripts/utils.js';
import { LIBS } from '../../scripts/scripts.js';

const BACOM_HOSTS = ['localhost', '--bacom--adobecom.hlx.page', '--bacom--adobecom.hlx.live', 'business.adobe.com'];

Expand Down Expand Up @@ -110,7 +110,7 @@ const init = async (el) => {

if (!topList) return;

const { createTag } = await import(`${getLibs()}/utils/utils.js`);
const { createTag } = await import(`${LIBS}/utils/utils.js`);
const subLists = topList.querySelectorAll('ul');
const isAccordion = subLists.length > 0;
const links = el.querySelectorAll('a');
Expand Down
6 changes: 3 additions & 3 deletions blocks/workfront-login/workfront-login.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getLibs } from '../../scripts/utils.js';
import { LIBS } from '../../scripts/scripts.js';

export async function createProofForm(createTag, replaceKey, config) {
const form = createTag('form', { action: 'https://app.proofhq.com/login', method: 'post' });
Expand Down Expand Up @@ -105,8 +105,8 @@ export async function createSubdomainForm(createTag, replaceKey, config) {

/* c8 ignore next 14 */
export default async function init(el) {
const { createTag, getConfig } = await import(`${getLibs()}/utils/utils.js`);
const { replaceKey } = await import(`${getLibs()}/features/placeholders.js`);
const { createTag, getConfig } = await import(`${LIBS}/utils/utils.js`);
const { replaceKey } = await import(`${LIBS}/features/placeholders.js`);
const config = getConfig();
const isProof = el.classList.contains('proof');

Expand Down
18 changes: 11 additions & 7 deletions scripts/scripts.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import { setLibs } from './utils.js';

const LIBS = '/libs';
const STYLES = ['/styles/styles.css'];
const CONFIG = {
imsClientId: 'bacom',
Expand Down Expand Up @@ -157,18 +154,25 @@ const loadStyle = (path) => {
eagerLoad(marquee.querySelector('img'));
}());

const miloLibs = setLibs(LIBS);
// eslint-disable-next-line import/prefer-default-export
export const LIBS = (() => {
const { hostname, search } = window.location;
if (!(hostname.includes('.hlx.') || hostname.includes('local'))) return LIBS;
const branch = new URLSearchParams(search).get('milolibs') || 'main';
JasonHowellSlavin marked this conversation as resolved.
Show resolved Hide resolved
JasonHowellSlavin marked this conversation as resolved.
Show resolved Hide resolved
if (branch === 'local') return 'http://localhost:6456/libs';
return branch.includes('--') ? `https://${branch}.hlx.live/libs` : `https://${branch}--milo--adobecom.hlx.live/libs`;
})();

(function loadStyles() {
const paths = [`${miloLibs}/styles/styles.css`];
const paths = [`${LIBS}/styles/styles.css`];
if (STYLES) {
paths.push(...(Array.isArray(STYLES) ? STYLES : [STYLES]));
}
paths.forEach(loadStyle);
}());

(async function loadPage() {
const { loadArea, loadLana, setConfig, createTag, getMetadata } = await import(`${miloLibs}/utils/utils.js`);
const { loadArea, loadLana, setConfig, createTag, getMetadata } = await import(`${LIBS}/utils/utils.js`);
if (getMetadata('template') === '404') window.SAMPLE_PAGEVIEWS_AT_RATE = 'high';
const metaCta = document.querySelector('meta[name="chat-cta"]');
if (metaCta && !document.querySelector('.chat-cta')) {
Expand All @@ -179,7 +183,7 @@ const miloLibs = setLibs(LIBS);
if (lastSection) lastSection.insertAdjacentElement('beforeend', chatDiv);
}
}
setConfig({ ...CONFIG, miloLibs });
setConfig({ ...CONFIG, miloLibs: LIBS });
loadLana({ clientId: 'bacom', tags: 'info' });
await loadArea();

Expand Down
4 changes: 2 additions & 2 deletions templates/featured-story/featured-story.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Templates - featured story
*/

import { getLibs } from '../../scripts/utils.js';
import { LIBS } from '../../scripts/scripts.js';

const { createTag } = await import(`${getLibs()}/utils/utils.js`);
const { createTag } = await import(`${LIBS}/utils/utils.js`);

function init() {
const i = 1;
Expand Down
Loading