From ae7fc0b7f2043140ed59bb2994c55b9adba24213 Mon Sep 17 00:00:00 2001 From: Saloni Jain <6162294+salonijain3@users.noreply.github.com> Date: Fri, 15 Mar 2024 10:42:08 +0530 Subject: [PATCH 01/13] Merge pull request #229 from aishwaryamathuria/codecov MWPW-144525 | Fixing the code coverage plugin path --- codecov.yaml | 10 ++++++++++ package.json | 8 ++++---- web-test-runner.config.mjs | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 codecov.yaml diff --git a/codecov.yaml b/codecov.yaml new file mode 100644 index 000000000..2b010ad32 --- /dev/null +++ b/codecov.yaml @@ -0,0 +1,10 @@ +coverage: + status: + patch: + default: + target: 100% + threshold: 0.1% + project: + default: + target: auto + threshold: 0.1% diff --git a/package.json b/package.json index 2122758f1..1bc262d04 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@adobecom/cc", "private": true, "version": "1.0.0", - "description": "Website foundation technology.", + "description": "Adobe Creative Cloud", "scripts": { "test": "wtr --config ./web-test-runner.config.mjs \"./test/**/*.test.(js|html)\" --node-resolve --port=2000 --coverage", "test:watch": "npm test -- --watch", @@ -15,14 +15,14 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/adobecom/college.git" + "url": "git+https://github.com/adobecom/cc.git" }, "author": "Adobe", "license": "Apache License 2.0", "bugs": { - "url": "https://github.com/adobecom/college/issues" + "url": "https://github.com/adobecom/cc/issues" }, - "homepage": "https://github.com/adobecom/college#readme", + "homepage": "https://github.com/adobecom/cc#readme", "devDependencies": { "@babel/core": "7.17.7", "@babel/eslint-parser": "7.17.0", diff --git a/web-test-runner.config.mjs b/web-test-runner.config.mjs index d9fff9166..6bf33cd2a 100644 --- a/web-test-runner.config.mjs +++ b/web-test-runner.config.mjs @@ -33,8 +33,8 @@ const swcImportMaps = Object.fromEntries([ export default { coverageConfig: { - include: ['src/**'], - exclude: ['test/mocks/**', 'test/**', '**/node_modules/**'], + include: ['creativecloud/**'], + exclude: ['test/mocks/**', 'test/**', '**/node_modules/**', 'creativecloud/deps/**'], }, debug: false, files: ['test/**/*.test.(js|html)'], From 4a0eaa0c3a5fa11f3a6f6d1b7a4404878291652c Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Mon, 18 Mar 2024 21:00:15 +0530 Subject: [PATCH 02/13] MWPW 144479 | Improve performance and reduce CLS for interactive marquee (#225) Improve performance and reduce CLS for interactive marquee Resolves: MWPW-144479 Test URLs: Before: https://main--cc--adobecom.hlx.live/drafts/ruchika/3a/firefly?martech=off After: https://mwpw-144479--cc--aishwaryamathuria.hlx.live/drafts/ruchika/3a/firefly?martech=off --- creativecloud/scripts/utils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/creativecloud/scripts/utils.js b/creativecloud/scripts/utils.js index 1970ce925..e98f3c64e 100644 --- a/creativecloud/scripts/utils.js +++ b/creativecloud/scripts/utils.js @@ -45,7 +45,7 @@ export const [setLibs, getLibs] = (() => { const miloLibs = setLibs('/libs'); -const { createTag, localizeLink } = await import(`${miloLibs}/utils/utils.js`); +const { createTag, localizeLink, getConfig, loadStyle } = await import(`${miloLibs}/utils/utils.js`); export { createTag, localizeLink }; function getDecorateAreaFn() { @@ -75,6 +75,7 @@ function getDecorateAreaFn() { firstBlock.querySelector(':scope > div:nth-child(1)').querySelectorAll('img').forEach(eagerLoad); fgDivs = firstBlock.querySelector(':scope > div:nth-child(2)').querySelectorAll('div:not(:first-child)'); fgDivs.forEach((d) => eagerLoad(d.querySelector('img'))); + if (!firstBlock.classList.contains('changebg')) loadStyle('/creativecloud/blocks/interactive-marquee/milo-marquee.css'); break; case !!fragmentLink: if (window.document.querySelector('a.fragment') === fragmentLink && !window.document.querySelector('img[loading="eager"]')) { From 05052543375cd5dad603ab41b544eb42a854bda6 Mon Sep 17 00:00:00 2001 From: mathuria Date: Mon, 18 Mar 2024 21:13:46 +0530 Subject: [PATCH 03/13] merge from main --- creativecloud/scripts/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/creativecloud/scripts/utils.js b/creativecloud/scripts/utils.js index e98f3c64e..7a5564b79 100644 --- a/creativecloud/scripts/utils.js +++ b/creativecloud/scripts/utils.js @@ -45,7 +45,7 @@ export const [setLibs, getLibs] = (() => { const miloLibs = setLibs('/libs'); -const { createTag, localizeLink, getConfig, loadStyle } = await import(`${miloLibs}/utils/utils.js`); +const { createTag, localizeLink, loadStyle } = await import(`${miloLibs}/utils/utils.js`); export { createTag, localizeLink }; function getDecorateAreaFn() { From d4292dfafa0b6c8918fae3003cb5067a5807970f Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:24:16 -0700 Subject: [PATCH 04/13] Sync main with stage (#234) * Update helix-query.yaml (#231) * MWPW-143057-Remove mt and cy_en from CC sitemap (#223) * Update sitemap-index.xml * Update helix-query.yaml * Update helix-sitemap.yaml * Update firefly-interactive.css (#222) --- .../features/firefly/firefly-interactive.css | 6 - creativecloud/sitemap-index.xml | 6 - helix-query.yaml | 117 ++++++++++++++---- helix-sitemap.yaml | 12 -- 4 files changed, 91 insertions(+), 50 deletions(-) diff --git a/creativecloud/features/firefly/firefly-interactive.css b/creativecloud/features/firefly/firefly-interactive.css index 3580afa72..280155eff 100644 --- a/creativecloud/features/firefly/firefly-interactive.css +++ b/creativecloud/features/firefly/firefly-interactive.css @@ -176,8 +176,6 @@ @media screen and (max-width: 1799px) and (min-width: 1650px) { .firefly-selectortray { - top: 144px; - position: absolute; right: -85px; } @@ -189,8 +187,6 @@ @media screen and (max-width: 1649px) and (min-width: 1438px) { .firefly-selectortray { - top: 144px; - position: absolute; right: -35px; } @@ -202,8 +198,6 @@ @media screen and (max-width: 1437px) and (min-width: 1200px) { .firefly-selectortray { - top: 144px; - position: absolute; right: 5px; } diff --git a/creativecloud/sitemap-index.xml b/creativecloud/sitemap-index.xml index 6477f71c9..c16c543ee 100644 --- a/creativecloud/sitemap-index.xml +++ b/creativecloud/sitemap-index.xml @@ -75,9 +75,6 @@ https://www.adobe.com/cl/cc-shared/assets/sitemap.xml - - https://www.adobe.com/cy_en/cc-shared/assets/sitemap.xml - https://www.adobe.com/gr_en/cc-shared/assets/sitemap.xml @@ -111,9 +108,6 @@ https://www.adobe.com/lu_en/cc-shared/assets/sitemap.xml - - https://www.adobe.com/mt/cc-shared/assets/sitemap.xml - https://www.adobe.com/sa_ar/cc-shared/assets/sitemap.xml diff --git a/helix-query.yaml b/helix-query.yaml index 532a35d6a..8bea9de5e 100644 --- a/helix-query.yaml +++ b/helix-query.yaml @@ -11,6 +11,7 @@ indices: include: - /creativecloud/** - /products/** + - /ai/** target: /cc-shared/assets/query-index.xlsx properties: title: @@ -61,6 +62,7 @@ indices: include: - /au/creativecloud/** - /au/products/** + - /au/ai/** target: /au/cc-shared/assets/query-index.xlsx cards-au: @@ -74,6 +76,7 @@ indices: include: - /de/creativecloud/** - /de/products/** + - /de/ai/** target: /de/cc-shared/assets/query-index.xlsx cards-de: @@ -87,6 +90,7 @@ indices: include: - /es/creativecloud/** - /es/products/** + - /es/ai/** target: /es/cc-shared/assets/query-index.xlsx cards-es: @@ -100,6 +104,7 @@ indices: include: - /fr/creativecloud/** - /fr/products/** + - /fr/ai/** target: /fr/cc-shared/assets/query-index.xlsx cards-fr: @@ -113,6 +118,7 @@ indices: include: - /it/creativecloud/** - /it/products/** + - /it/ai/** target: /it/cc-shared/assets/query-index.xlsx cards-it: @@ -126,6 +132,7 @@ indices: include: - /jp/creativecloud/** - /jp/products/** + - /jp/ai/** target: /jp/cc-shared/assets/query-index.xlsx cards-jp: @@ -139,6 +146,7 @@ indices: include: - /kr/creativecloud/** - /kr/products/** + - /kr/ai/** target: /kr/cc-shared/assets/query-index.xlsx cards-kr: @@ -152,6 +160,7 @@ indices: include: - /ru/creativecloud/** - /ru/products/** + - /ru/ai/** target: /ru/cc-shared/assets/query-index.xlsx cards-ru: @@ -165,6 +174,7 @@ indices: include: - /hk_zh/creativecloud/** - /hk_zh/products/** + - /hk_zh/ai/** target: /hk_zh/cc-shared/assets/query-index.xlsx cards-hk_zh: @@ -178,6 +188,7 @@ indices: include: - /tw/creativecloud/** - /tw/products/** + - /tw/ai/** target: /tw/cc-shared/assets/query-index.xlsx cards-tw: @@ -191,6 +202,7 @@ indices: include: - /nl/creativecloud/** - /nl/products/** + - /nl/ai/** target: /nl/cc-shared/assets/query-index.xlsx cards-nl: @@ -204,6 +216,7 @@ indices: include: - /pl/creativecloud/** - /pl/products/** + - /pl/ai/** target: /pl/cc-shared/assets/query-index.xlsx cards-pl: @@ -217,6 +230,7 @@ indices: include: - /tr/creativecloud/** - /tr/products/** + - /tr/ai/** target: /tr/cc-shared/assets/query-index.xlsx cards-tr: @@ -230,6 +244,7 @@ indices: include: - /uk/creativecloud/** - /uk/products/** + - /uk/ai/** target: /uk/cc-shared/assets/query-index.xlsx cards-uk: @@ -243,6 +258,7 @@ indices: include: - /ca/creativecloud/** - /ca/products/** + - /ca/ai/** target: /ca/cc-shared/assets/query-index.xlsx cards-ca: @@ -256,6 +272,7 @@ indices: include: - /cn/creativecloud/** - /cn/products/** + - /cn/ai/** target: /cn/cc-shared/assets/query-index.xlsx cards-cn: @@ -269,6 +286,7 @@ indices: include: - /ae_ar/creativecloud/** - /ae_ar/products/** + - /ae_ar/ai/** target: /ae_ar/cc-shared/assets/query-index.xlsx cards-ae_ar: @@ -282,6 +300,7 @@ indices: include: - /ae_en/creativecloud/** - /ae_en/products/** + - /ae_en/ai/** target: /ae_en/cc-shared/assets/query-index.xlsx cards-ae_en: @@ -295,6 +314,7 @@ indices: include: - /at/creativecloud/** - /at/products/** + - /at/ai/** target: /at/cc-shared/assets/query-index.xlsx cards-at: @@ -308,6 +328,7 @@ indices: include: - /be_en/creativecloud/** - /be_en/products/** + - /be_en/ai/** target: /be_en/cc-shared/assets/query-index.xlsx cards-be_en: @@ -321,6 +342,7 @@ indices: include: - /be_fr/creativecloud/** - /be_fr/products/** + - /be_fr/ai/** target: /be_fr/cc-shared/assets/query-index.xlsx cards-be_fr: @@ -334,6 +356,7 @@ indices: include: - /ca_fr/creativecloud/** - /ca_fr/products/** + - /ca_fr/ai/** target: /ca_fr/cc-shared/assets/query-index.xlsx cards-ca_fr: @@ -347,6 +370,7 @@ indices: include: - /ch_de/creativecloud/** - /ch_de/products/** + - /ch_de/ai/** target: /ch_de/cc-shared/assets/query-index.xlsx cards-ch_de: @@ -360,6 +384,7 @@ indices: include: - /ch_fr/creativecloud/** - /ch_fr/products/** + - /ch_fr/ai/** target: /ch_fr/cc-shared/assets/query-index.xlsx cards-ch_fr: @@ -373,6 +398,7 @@ indices: include: - /cl/creativecloud/** - /cl/products/** + - /cl/ai/** target: /cl/cc-shared/assets/query-index.xlsx cards-cl: @@ -381,24 +407,12 @@ indices: - /cl/cc-shared/fragments/merch/**/merch-card/** target: /cl/cc-shared/assets/query-index-cards.xslx - creativecloud-cy_en: - <<: *def - include: - - /cy_en/creativecloud/** - - /cy_en/products/** - target: /cy_en/cc-shared/assets/query-index.xlsx - - cards-cy_en: - <<: *merch-cards - include: - - /cy_en/cc-shared/fragments/merch/**/merch-card/** - target: /cy_en/cc-shared/assets/query-index-cards.xslx - creativecloud-gr_en: <<: *def include: - /gr_en/creativecloud/** - /gr_en/products/** + - /gr_en/ai/** target: /gr_en/cc-shared/assets/query-index.xlsx cards-gr_en: @@ -412,6 +426,7 @@ indices: include: - /hk_en/creativecloud/** - /hk_en/products/** + - /hk_en/ai/** target: /hk_en/cc-shared/assets/query-index.xlsx cards-hk_en: @@ -425,6 +440,7 @@ indices: include: - /ie/creativecloud/** - /ie/products/** + - /ie/ai/** target: /ie/cc-shared/assets/query-index.xlsx cards-ie: @@ -438,6 +454,7 @@ indices: include: - /il_en/creativecloud/** - /il_en/products/** + - /il_en/ai/** target: /il_en/cc-shared/assets/query-index.xlsx cards-il_en: @@ -451,6 +468,7 @@ indices: include: - /in/creativecloud/** - /in/products/** + - /in/ai/** target: /in/cc-shared/assets/query-index.xlsx cards-in: @@ -464,6 +482,7 @@ indices: include: - /lt/creativecloud/** - /lt/products/** + - /lt/ai/** target: /lt/cc-shared/assets/query-index.xlsx cards-lt: @@ -477,6 +496,7 @@ indices: include: - /lu_de/creativecloud/** - /lu_de/products/** + - /lu_de/ai/** target: /lu_de/cc-shared/assets/query-index.xlsx cards-lu_de: @@ -490,6 +510,7 @@ indices: include: - /lu_en/creativecloud/** - /lu_en/products/** + - /lu_en/ai/** target: /lu_en/cc-shared/assets/query-index.xlsx cards-lu_en: @@ -503,6 +524,7 @@ indices: include: - /lu_fr/creativecloud/** - /lu_fr/products/** + - /lu_fr/ai/** target: /lu_fr/cc-shared/assets/query-index.xlsx cards-lu_fr: @@ -516,6 +538,7 @@ indices: include: - /mena_en/creativecloud/** - /mena_en/products/** + - /mena_en/ai/** target: /mena_en/cc-shared/assets/query-index.xlsx cards-mena_en: @@ -524,24 +547,12 @@ indices: - /mena_en/cc-shared/fragments/merch/**/merch-card/** target: /mena_en/cc-shared/assets/query-index-cards.xslx - creativecloud-mt: - <<: *def - include: - - /mt/creativecloud/** - - /mt/products/** - target: /mt/cc-shared/assets/query-index.xlsx - - cards-mt: - <<: *merch-cards - include: - - /mt/cc-shared/fragments/merch/**/merch-card/** - target: /mt/cc-shared/assets/query-index-cards.xslx - creativecloud-nz: <<: *def include: - /nz/creativecloud/** - /nz/products/** + - /nz/ai/** target: /nz/cc-shared/assets/query-index.xlsx cards-nz: @@ -555,6 +566,7 @@ indices: include: - /sa_ar/creativecloud/** - /sa_ar/products/** + - /sa_ar/ai/** target: /sa_ar/cc-shared/assets/query-index.xlsx cards-sa_ar: @@ -568,6 +580,7 @@ indices: include: - /sa_en/creativecloud/** - /sa_en/products/** + - /sa_en/ai/** target: /sa_en/cc-shared/assets/query-index.xlsx cards-sa_en: @@ -581,6 +594,7 @@ indices: include: - /th_en/creativecloud/** - /th_en/products/** + - /th_en/ai/** target: /th_en/cc-shared/assets/query-index.xlsx cards-th_en: @@ -594,6 +608,7 @@ indices: include: - /th_th/creativecloud/** - /th_th/products/** + - /th_th/ai/** target: /th_th/cc-shared/assets/query-index.xlsx cards-th_th: @@ -607,6 +622,7 @@ indices: include: - /za/creativecloud/** - /za/products/** + - /za/ai/** target: /za/cc-shared/assets/query-index.xlsx cards-za: @@ -620,6 +636,7 @@ indices: include: - /africa/creativecloud/** - /africa/products/** + - /africa/ai/** target: /africa/cc-shared/assets/query-index.xlsx cards-africa: @@ -633,6 +650,7 @@ indices: include: - /ar/creativecloud/** - /ar/products/** + - /ar/ai/** target: /ar/cc-shared/assets/query-index.xlsx cards-ar: @@ -646,6 +664,7 @@ indices: include: - /co/creativecloud/** - /co/products/** + - /co/ai/** target: /co/cc-shared/assets/query-index.xlsx cards-co: @@ -659,6 +678,7 @@ indices: include: - /cr/creativecloud/** - /cr/products/** + - /cr/ai/** target: /cr/cc-shared/assets/query-index.xlsx cards-cr: @@ -672,6 +692,7 @@ indices: include: - /ec/creativecloud/** - /ec/products/** + - /ec/ai/** target: /ec/cc-shared/assets/query-index.xlsx cards-ec: @@ -685,6 +706,7 @@ indices: include: - /eg_ar/creativecloud/** - /eg_ar/products/** + - /eg_ar/ai/** target: /eg_ar/cc-shared/assets/query-index.xlsx cards-eg_ar: @@ -698,6 +720,7 @@ indices: include: - /eg_en/creativecloud/** - /eg_en/products/** + - /eg_en/ai/** target: /eg_en/cc-shared/assets/query-index.xlsx cards-eg_en: @@ -711,6 +734,7 @@ indices: include: - /gr_el/creativecloud/** - /gr_el/products/** + - /gr_el/ai/** target: /gr_el/cc-shared/assets/query-index.xlsx cards-gr_el: @@ -724,6 +748,7 @@ indices: include: - /gt/creativecloud/** - /gt/products/** + - /gt/ai/** target: /gt/cc-shared/assets/query-index.xlsx cards-gt: @@ -737,6 +762,7 @@ indices: include: - /id_en/creativecloud/** - /id_en/products/** + - /id_en/ai/** target: /id_en/cc-shared/assets/query-index.xlsx cards-id_en: @@ -750,6 +776,7 @@ indices: include: - /id_id/creativecloud/** - /id_id/products/** + - /id_id/ai/** target: /id_id/cc-shared/assets/query-index.xlsx cards-id_id: @@ -763,6 +790,7 @@ indices: include: - /in_hi/creativecloud/** - /in_hi/products/** + - /in_hi/ai/** target: /in_hi/cc-shared/assets/query-index.xlsx cards-in_hi: @@ -776,6 +804,7 @@ indices: include: - /kw_ar/creativecloud/** - /kw_ar/products/** + - /kw_ar/ai/** target: /kw_ar/cc-shared/assets/query-index.xlsx cards-kw_ar: @@ -789,6 +818,7 @@ indices: include: - /kw_en/creativecloud/** - /kw_en/products/** + - /kw_en/ai/** target: /kw_en/cc-shared/assets/query-index.xlsx cards-kw_en: @@ -802,6 +832,7 @@ indices: include: - /my_en/creativecloud/** - /my_en/products/** + - /my_en/ai/** target: /my_en/cc-shared/assets/query-index.xlsx cards-my_en: @@ -815,6 +846,7 @@ indices: include: - /my_ms/creativecloud/** - /my_ms/products/** + - /my_ms/ai/** target: /my_ms/cc-shared/assets/query-index.xlsx cards-my_ms: @@ -828,6 +860,7 @@ indices: include: - /ng/creativecloud/** - /ng/products/** + - /ng/ai/** target: /ng/cc-shared/assets/query-index.xlsx cards-ng: @@ -841,6 +874,7 @@ indices: include: - /pe/creativecloud/** - /pe/products/** + - /pe/ai/** target: /pe/cc-shared/assets/query-index.xlsx cards-pe: @@ -854,6 +888,7 @@ indices: include: - /ph_en/creativecloud/** - /ph_en/products/** + - /ph_en/ai/** target: /ph_en/cc-shared/assets/query-index.xlsx cards-ph_en: @@ -867,6 +902,7 @@ indices: include: - /ph_fil/creativecloud/** - /ph_fil/products/** + - /ph_fil/ai/** target: /ph_fil/cc-shared/assets/query-index.xlsx cards-ph_fil: @@ -880,6 +916,7 @@ indices: include: - /pr/creativecloud/** - /pr/products/** + - /pr/ai/** target: /pr/cc-shared/assets/query-index.xlsx cards-pr: @@ -893,6 +930,7 @@ indices: include: - /qa_ar/creativecloud/** - /qa_ar/products/** + - /qa_ar/ai/** target: /qa_ar/cc-shared/assets/query-index.xlsx cards-qa_ar: @@ -906,6 +944,7 @@ indices: include: - /qa_en/creativecloud/** - /qa_en/products/** + - /qa_en/ai/** target: /qa_en/cc-shared/assets/query-index.xlsx cards-qa_en: @@ -919,6 +958,7 @@ indices: include: - /vn_en/creativecloud/** - /vn_en/products/** + - /vn_en/ai/** target: /vn_en/cc-shared/assets/query-index.xlsx cards-vn_en: @@ -932,6 +972,7 @@ indices: include: - /vn_vi/creativecloud/** - /vn_vi/products/** + - /vn_vi/ai/** target: /vn_vi/cc-shared/assets/query-index.xlsx cards-vn_vi: @@ -945,6 +986,7 @@ indices: include: - /dk/creativecloud/** - /dk/products/** + - /dk/ai/** target: /dk/cc-shared/assets/query-index.xlsx cards-dk: @@ -958,6 +1000,7 @@ indices: include: - /fi/creativecloud/** - /fi/products/** + - /fi/ai/** target: /fi/cc-shared/assets/query-index.xlsx cards-fi: @@ -971,6 +1014,7 @@ indices: include: - /no/creativecloud/** - /no/products/** + - /no/ai/** target: /no/cc-shared/assets/query-index.xlsx cards-no: @@ -984,6 +1028,7 @@ indices: include: - /se/creativecloud/** - /se/products/** + - /se/ai/** target: /se/cc-shared/assets/query-index.xlsx cards-se: @@ -997,6 +1042,7 @@ indices: include: - /la/creativecloud/** - /la/products/** + - /la/ai/** target: /la/cc-shared/assets/query-index.xlsx cards-la: @@ -1010,6 +1056,7 @@ indices: include: - /mx/creativecloud/** - /mx/products/** + - /mx/ai/** target: /mx/cc-shared/assets/query-index.xlsx cards-mx: @@ -1023,6 +1070,7 @@ indices: include: - /be_nl/creativecloud/** - /be_nl/products/** + - /be_nl/ai/** target: /be_nl/cc-shared/assets/query-index.xlsx cards-be_nl: @@ -1036,6 +1084,7 @@ indices: include: - /bg/creativecloud/** - /bg/products/** + - /bg/ai/** target: /bg/cc-shared/assets/query-index.xlsx cards-bg: @@ -1049,6 +1098,7 @@ indices: include: - /ch_it/creativecloud/** - /ch_it/products/** + - /ch_it/ai/** target: /ch_it/cc-shared/assets/query-index.xlsx cards-ch_it: @@ -1062,6 +1112,7 @@ indices: include: - /cz/creativecloud/** - /cz/products/** + - /cz/ai/** target: /cz/cc-shared/assets/query-index.xlsx cards-cz: @@ -1075,6 +1126,7 @@ indices: include: - /ee/creativecloud/** - /ee/products/** + - /ee/ai/** target: /ee/cc-shared/assets/query-index.xlsx cards-ee: @@ -1088,6 +1140,7 @@ indices: include: - /hu/creativecloud/** - /hu/products/** + - /hu/ai/** target: /hu/cc-shared/assets/query-index.xlsx cards-hu: @@ -1101,6 +1154,7 @@ indices: include: - /il_he/creativecloud/** - /il_he/products/** + - /il_he/ai/** target: /il_he/cc-shared/assets/query-index.xlsx cards-il_he: @@ -1114,6 +1168,7 @@ indices: include: - /lv/creativecloud/** - /lv/products/** + - /lv/ai/** target: /lv/cc-shared/assets/query-index.xlsx cards-lv: @@ -1127,6 +1182,7 @@ indices: include: - /mena_ar/creativecloud/** - /mena_ar/products/** + - /mena_ar/ai/** target: /mena_ar/cc-shared/assets/query-index.xlsx cards-mena_ar: @@ -1140,6 +1196,7 @@ indices: include: - /pt/creativecloud/** - /pt/products/** + - /pt/ai/** target: /pt/cc-shared/assets/query-index.xlsx cards-pt: @@ -1153,6 +1210,7 @@ indices: include: - /ro/creativecloud/** - /ro/products/** + - /ro/ai/** target: /ro/cc-shared/assets/query-index.xlsx cards-ro: @@ -1166,6 +1224,7 @@ indices: include: - /si/creativecloud/** - /si/products/** + - /si/ai/** target: /si/cc-shared/assets/query-index.xlsx cards-si: @@ -1179,6 +1238,7 @@ indices: include: - /sk/creativecloud/** - /sk/products/** + - /sk/ai/** target: /sk/cc-shared/assets/query-index.xlsx cards-sk: @@ -1192,6 +1252,7 @@ indices: include: - /ua/creativecloud/** - /ua/products/** + - /ua/ai/** target: /ua/cc-shared/assets/query-index.xlsx cards-ua: @@ -1205,6 +1266,7 @@ indices: include: - /sg/creativecloud/** - /sg/products/** + - /sg/ai/** target: /sg/cc-shared/assets/query-index.xlsx cards-sg: @@ -1218,6 +1280,7 @@ indices: include: - /br/creativecloud/** - /br/products/** + - /br/ai/** target: /br/cc-shared/assets/query-index.xlsx cards-br: @@ -1231,6 +1294,7 @@ indices: include: - /cis_en/creativecloud/** - /cis_en/products/** + - /cis_en/ai/** target: /cis_en/cc-shared/assets/query-index.xlsx cards-cis_en: @@ -1244,6 +1308,7 @@ indices: include: - /cis_ru/creativecloud/** - /cis_ru/products/** + - /cis_ru/ai/** target: /cis_ru/cc-shared/assets/query-index.xlsx cards-cis_ru: diff --git a/helix-sitemap.yaml b/helix-sitemap.yaml index b8d3b5a4c..79db75317 100644 --- a/helix-sitemap.yaml +++ b/helix-sitemap.yaml @@ -162,12 +162,6 @@ sitemaps: destination: /cl/cc-shared/assets/sitemap.xml hreflang: es-CL - cy_en: - source: /cy_en/cc-shared/assets/query-index.json - alternate: /cy_en/{path}.html - destination: /cy_en/cc-shared/assets/sitemap.xml - hreflang: en-CY - gr_en: source: /gr_en/cc-shared/assets/query-index.json alternate: /gr_en/{path}.html @@ -227,12 +221,6 @@ sitemaps: alternate: /mena_en/{path}.html destination: /mena_en/cc-shared/assets/sitemap.xml hreflang: en-DZ - - mt: - source: /mt/cc-shared/assets/query-index.json - alternate: /mt/{path}.html - destination: /mt/cc-shared/assets/sitemap.xml - hreflang: en-MT nz: source: /nz/cc-shared/assets/query-index.json From 7ea701608f8e8bfb73f4c7ab7cb95e70a36de99a Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Tue, 19 Mar 2024 15:24:54 +0530 Subject: [PATCH 05/13] Update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 325ff3a90..f7ea2d3a1 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @salonijain3 @aishwaryamathuria @Ruchika4 @amitbikram @raga-adbe-gh +* @adobecom/cc-code-owners From 394c1901e522be0d99915e8af677366856b37497 Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Thu, 21 Mar 2024 18:42:40 +0530 Subject: [PATCH 06/13] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 62ec0208d..f43e205f9 100644 --- a/README.md +++ b/README.md @@ -47,3 +47,5 @@ If you need to lint just one file, you can run: ```sh npx eslint file1.js ``` +## Code merge process +https://github.com/adobecom/cc/wiki From 6e09f6d514d90c115fddf33999abaf05f977bcee Mon Sep 17 00:00:00 2001 From: Aishwarya Mathuria Date: Thu, 21 Mar 2024 18:43:02 +0530 Subject: [PATCH 07/13] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f43e205f9..b31e06235 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # CC x Milo The Franklin based project for creative cloud pages on www.adobe.com. Based off of milo-college. +## Code merge process +https://github.com/adobecom/cc/wiki + ## Developing 1. Install the [AEM CLI](https://github.com/adobe/helix-cli): `sudo npm install -g @adobe/aem-cli` 2. Run `aem up` this repo's folder. (opens your browser at `http://localhost:3000`) @@ -47,5 +50,3 @@ If you need to lint just one file, you can run: ```sh npx eslint file1.js ``` -## Code merge process -https://github.com/adobecom/cc/wiki From 272a9926dacb5bbad453a688cd875bff4f87b618 Mon Sep 17 00:00:00 2001 From: Ruchika Sinha <69535463+Ruchika4@users.noreply.github.com> Date: Mon, 25 Mar 2024 21:42:33 -0700 Subject: [PATCH 08/13] MWPW-145307- Move enticement text to p tag (#250) * remove h2 for enticement text * remove h2 for enticement text --- creativecloud/features/genfill/genfill-interactive.css | 1 + .../features/interactive-elements/interactive-elements.css | 1 + .../features/interactive-elements/interactive-elements.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/creativecloud/features/genfill/genfill-interactive.css b/creativecloud/features/genfill/genfill-interactive.css index cde5dc31f..a63a898fb 100644 --- a/creativecloud/features/genfill/genfill-interactive.css +++ b/creativecloud/features/genfill/genfill-interactive.css @@ -35,6 +35,7 @@ margin: 40px 0 16px -20px; top: -90px; color: var(--color-white); + font-weight: 700; } .enticement-text.light { diff --git a/creativecloud/features/interactive-elements/interactive-elements.css b/creativecloud/features/interactive-elements/interactive-elements.css index 4b75aa1d0..fcb66f258 100644 --- a/creativecloud/features/interactive-elements/interactive-elements.css +++ b/creativecloud/features/interactive-elements/interactive-elements.css @@ -57,6 +57,7 @@ margin: 40px 0 16px -20px; top: -90px; color: var(--color-white); + font-weight: 700; } .enticement-text.light { diff --git a/creativecloud/features/interactive-elements/interactive-elements.js b/creativecloud/features/interactive-elements/interactive-elements.js index f4bcb1e1a..d4c77e2a0 100644 --- a/creativecloud/features/interactive-elements/interactive-elements.js +++ b/creativecloud/features/interactive-elements/interactive-elements.js @@ -40,7 +40,7 @@ export async function createEnticement(enticementDetail, mode) { const svgImage = createTag('img', { class: 'enticement-arrow', alt: '' }); let arrowText; [arrowText, svgImage.src] = enticementDetail.split('|'); - const enticementText = createTag('h2', { class: 'enticement-text' }, arrowText.trim()); + const enticementText = createTag('p', { class: 'enticement-text' }, arrowText.trim()); enticementDiv.append(enticementText, svgImage); if (mode === 'light') enticementText.classList.add('light'); return enticementDiv; From 52fab3af690c9631374728a9ad27076e12e0e74e Mon Sep 17 00:00:00 2001 From: Drashti Modasara Date: Tue, 26 Mar 2024 16:03:46 +0530 Subject: [PATCH 09/13] [MWPW-143093]-[Interactive Marquee - Media] Rename media classname to avoid collisions (#219) * Update scripts.js * Update universal-promo-terms.js (#211) * add cis sitemaps (#205) * [Stage] add products to index (#216) * add products to index * add sitemaps live links * media to asset * media to asset * Update helix-query.yaml - fix line break --------- Co-authored-by: Aishwarya Mathuria Co-authored-by: sharath-kannan <138484653+sharath-kannan@users.noreply.github.com> Co-authored-by: Mariia Lukianets Co-authored-by: Drashti Modasara --- .../blocks/interactive-marquee/interactive-marquee.js | 4 ++-- creativecloud/blocks/interactive-marquee/milo-marquee.css | 6 +++--- creativecloud/features/firefly/firefly-interactive.css | 8 ++++---- creativecloud/features/firefly/firefly-interactive.js | 2 +- creativecloud/features/genfill/genfill-interactive.css | 2 +- creativecloud/features/genfill/genfill-interactive.js | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/creativecloud/blocks/interactive-marquee/interactive-marquee.js b/creativecloud/blocks/interactive-marquee/interactive-marquee.js index 41d643d71..c39ccf59e 100644 --- a/creativecloud/blocks/interactive-marquee/interactive-marquee.js +++ b/creativecloud/blocks/interactive-marquee/interactive-marquee.js @@ -52,14 +52,14 @@ function interactiveInit(el, decorateButtons, decorateBlockBg, createTag) { if (media) { const interactiveBox = createTag('div', { class: 'interactive-container' }); mediaElements.forEach((mediaDiv) => { - mediaDiv.classList.add('media'); + mediaDiv.classList.add('asset'); interactiveBox.appendChild(mediaDiv); }); foreground.appendChild(interactiveBox); } const firstDivInForeground = foreground.querySelector(':scope > div'); - if (firstDivInForeground?.classList.contains('media')) el.classList.add('row-reversed'); + if (firstDivInForeground?.classList.contains('asset')) el.classList.add('row-reversed'); decorateButtons(text, 'button-xl'); decorateText(text, createTag); diff --git a/creativecloud/blocks/interactive-marquee/milo-marquee.css b/creativecloud/blocks/interactive-marquee/milo-marquee.css index 9546af830..0a9810c31 100644 --- a/creativecloud/blocks/interactive-marquee/milo-marquee.css +++ b/creativecloud/blocks/interactive-marquee/milo-marquee.css @@ -24,7 +24,7 @@ border: 4px; } -.interactive-marquee .media { +.interactive-marquee .asset { max-width: 300px; position: relative; padding: 0; @@ -131,7 +131,7 @@ width: 569px; } - .interactive-marquee .media { + .interactive-marquee .asset { max-width: 569px; top: 35px; } @@ -175,7 +175,7 @@ margin: 0; } - .interactive-marquee .media { + .interactive-marquee .asset { top: 91px; margin: 0 auto; } diff --git a/creativecloud/features/firefly/firefly-interactive.css b/creativecloud/features/firefly/firefly-interactive.css index 280155eff..d5686d566 100644 --- a/creativecloud/features/firefly/firefly-interactive.css +++ b/creativecloud/features/firefly/firefly-interactive.css @@ -39,12 +39,12 @@ cursor: pointer; } -.interactive-marquee.firefly .media { +.interactive-marquee.firefly .asset { top: 72px; } -.interactive-marquee.firefly .media picture img, -.interactive-marquee.firefly .media video { +.interactive-marquee.firefly .asset picture img, +.interactive-marquee.firefly .asset video { border-radius: 16px; } @@ -95,7 +95,7 @@ height: 440px; } - .interactive-marquee.firefly .media { + .interactive-marquee.firefly .asset { top: 24px; } diff --git a/creativecloud/features/firefly/firefly-interactive.js b/creativecloud/features/firefly/firefly-interactive.js index 809de22cb..995e033f6 100644 --- a/creativecloud/features/firefly/firefly-interactive.js +++ b/creativecloud/features/firefly/firefly-interactive.js @@ -109,7 +109,7 @@ export default async function setInteractiveFirefly(el) { const interactiveElemMode = el.classList.contains('light') ? 'dark' : 'light'; const buttons = el.querySelectorAll('.con-button'); [...buttons].forEach((button) => { if (button.innerText.includes('Firefly')) button.setAttribute('daa-ll', 'getfirefly'); }); - const media = el.querySelector('.media'); + const media = el.querySelector('.asset'); const allP = media.querySelectorAll('p:not(:empty)'); const allAnchorTag = media.querySelectorAll('a'); // Get InteractiveSelection Value diff --git a/creativecloud/features/genfill/genfill-interactive.css b/creativecloud/features/genfill/genfill-interactive.css index a63a898fb..952e598b0 100644 --- a/creativecloud/features/genfill/genfill-interactive.css +++ b/creativecloud/features/genfill/genfill-interactive.css @@ -12,7 +12,7 @@ display: none; } -.genfill .media a { +.genfill .asset a { cursor: pointer; position: absolute; top: 0; diff --git a/creativecloud/features/genfill/genfill-interactive.js b/creativecloud/features/genfill/genfill-interactive.js index bfe15f149..0410dd96d 100644 --- a/creativecloud/features/genfill/genfill-interactive.js +++ b/creativecloud/features/genfill/genfill-interactive.js @@ -8,7 +8,7 @@ async function addEnticement(container, enticement, mode) { entcmtEl.classList.add('enticement'); const viewports = ['tablet', 'desktop']; viewports.forEach((v) => { - const mDiv = container.querySelector(`.media.${v}-only`); + const mDiv = container.querySelector(`.asset.${v}-only`); mDiv.insertBefore(entcmtEl.cloneNode(true), mDiv.firstElementChild); }); } @@ -51,7 +51,7 @@ function startAutocycle(a, autoCycleConfig, viewport, deviceConfig, interval, hT } function processMedia(ic, miloUtil, autoCycleConfig, deviceConfig, v, hText) { - const media = miloUtil.createTag('div', { class: `media ${v}-only` }); + const media = miloUtil.createTag('div', { class: `asset ${v}-only` }); const a = miloUtil.createTag('a', { class: 'genfill-link' }); const img = miloUtil.createTag('img', { class: 'genfill-image' }); const src = deviceConfig[v].srcList[0]; @@ -84,7 +84,7 @@ export default async function decorateGenfill(el, miloUtil) { const heading = ic.closest('.foreground').querySelector('h1, h2, h3, h4, h5, h6'); const hText = heading.id .split('-').map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(''); - const allP = ic.querySelectorAll('.media:first-child p'); + const allP = ic.querySelectorAll('.asset:first-child p'); const pMetadata = [...allP].filter((p) => !p.querySelector('picture')); const [enticement, timer = null] = [...pMetadata]; enticement.classList.add('enticement-detail'); @@ -102,7 +102,7 @@ export default async function decorateGenfill(el, miloUtil) { tablet: { srcList: [], attrList: [], index: 0 }, desktop: { srcList: [], attrList: [], index: 0 }, }; - const mediaElements = currentDom.querySelectorAll('.media'); + const mediaElements = currentDom.querySelectorAll('.asset'); viewports.forEach((v, vi) => { const media = mediaElements[vi] ? mediaElements[vi] From 2247a5887d8d032a9fddf515968a24824db0793a Mon Sep 17 00:00:00 2001 From: mathuria Date: Thu, 28 Mar 2024 22:04:01 +0530 Subject: [PATCH 10/13] Load media from cc-shared for root --- creativecloud/scripts/utils.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/creativecloud/scripts/utils.js b/creativecloud/scripts/utils.js index 7a5564b79..12768295f 100644 --- a/creativecloud/scripts/utils.js +++ b/creativecloud/scripts/utils.js @@ -45,7 +45,7 @@ export const [setLibs, getLibs] = (() => { const miloLibs = setLibs('/libs'); -const { createTag, localizeLink, loadStyle } = await import(`${miloLibs}/utils/utils.js`); +const { createTag, localizeLink, getConfig, loadStyle } = await import(`${miloLibs}/utils/utils.js`); export { createTag, localizeLink }; function getDecorateAreaFn() { @@ -58,13 +58,25 @@ function getDecorateAreaFn() { if (lcpImg) lcpImgSet = true; }; + function replaceDotMedia(area = document) { + const currUrl = new URL(window.location); + const pathSeg = currUrl.pathname.split('/').length; + if (pathSeg >= 3) return; + const resetAttributeBase = (tag, attr) => { + area.querySelectorAll(`${tag}[${attr}^="./media_"]`).forEach((el) => { + el[attr] = `${new URL(`${getConfig().contentRoot}${el.getAttribute(attr).substring(1)}`, window.location).href}`; + }); + }; + resetAttributeBase('img', 'src'); + resetAttributeBase('source', 'srcset'); + } + async function loadLCPImage(area = document, { fragmentLink = null } = {}) { const firstBlock = area.querySelector('body > main > div > div'); let fgDivs = null; switch (true) { case firstBlock?.classList.contains('changebg'): { firstBlock.querySelector(':scope > div:nth-child(1)').querySelectorAll('img').forEach(eagerLoad); - const { getConfig } = await import(`${getLibs()}/utils/utils.js`); import(`${getConfig().codeRoot}/deps/interactive-marquee-changebg/changeBgMarquee.js`); break; } @@ -89,6 +101,7 @@ function getDecorateAreaFn() { } return (area, options) => { + replaceDotMedia(); if (!lcpImgSet) loadLCPImage(area, options); }; } From 92e35768a364ed85e241b3e46dc7387992c59330 Mon Sep 17 00:00:00 2001 From: "J. Casalino" Date: Thu, 28 Mar 2024 17:58:38 -0400 Subject: [PATCH 11/13] Create Kodiak config.yaml (#244) * Create Kodiak config.yaml Create Kodiak auto-ticketing config for MWPW-143712 and MWPW-143708 * Add watchers and assign to sumanh instead Also edit the "team" field per Jed's troubleshooting with Javelin. --- .kodiak/config.yaml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .kodiak/config.yaml diff --git a/.kodiak/config.yaml b/.kodiak/config.yaml new file mode 100644 index 000000000..87180db79 --- /dev/null +++ b/.kodiak/config.yaml @@ -0,0 +1,31 @@ +version: 1.0 + +snow: + - id: 545562 # Milo CC + +notifications: + jira: + default: + project: MWPW # Mandatory + filters: + include: + risk_rating: R5 + fields: + assignee: + name: sumanh + customfield_11800: MWPW-140779 #epic link + customfield_12900: + value: Brahmos + watchers: + - casalino + - jmichnow + - mauchley + - saljain + - mathuria + - dstrong + labels: + - "OriginatingProcess=Kodiak" + - "security" + - "kodiak-ticket" + components: + - name: "DevOps Security" From 886068326886de533f6797959bfdd1de5de22f86 Mon Sep 17 00:00:00 2001 From: Ryan Clayton Date: Tue, 2 Apr 2024 11:50:29 -0600 Subject: [PATCH 12/13] Update config.json (#258) Adding bulk publishing to tools dropdown. --- tools/sidekick/config.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/sidekick/config.json b/tools/sidekick/config.json index 91a30a53e..18d741e3a 100644 --- a/tools/sidekick/config.json +++ b/tools/sidekick/config.json @@ -135,6 +135,13 @@ "url": "https://milo.adobe.com/tools/faas", "isPalette": false, "includePaths": [ "**.docx**"] + }, + { + "containerId": "tools", + "id": "bulk", + "title": "Bulk operations", + "environments": [ "edit", "dev", "preview", "live" ], + "url": "https://main--cc--adobecom.hlx.page/tools/bulk-publish" } ] } From c4f8a2b8618de85301a813d4384ac1d6f5758c7d Mon Sep 17 00:00:00 2001 From: Saloni Jain <6162294+salonijain3@users.noreply.github.com> Date: Wed, 3 Apr 2024 14:10:33 +0530 Subject: [PATCH 13/13] Update pull_request_template.md --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a3dabef08..dd03e8774 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,5 +3,5 @@ Resolves: [MWPW-NUMBER](https://jira.corp.adobe.com/browse/MWPW-NUMBER) **Test URLs:** -- Before: https://main--cc--adobecom.hlx.page/?martech=off -- After: https://--cc--adobecom.hlx.page/?martech=off +- Before: https://main--cc--adobecom.hlx.live/?martech=off +- After: https://--cc--adobecom.hlx.live/?martech=off