Skip to content

Commit

Permalink
Merge branch 'main' into migration-rum-js-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
kptdobe committed Jul 16, 2024
2 parents 4410891 + f9f0cda commit e150047
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 109 deletions.
7 changes: 4 additions & 3 deletions 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<meta property="og:title" content="Page not found">
<script src="/scripts/scripts.js" type="module" crossorigin="use-credentials"></script>
<script type="module">
import { sampleRUM } from '/scripts/aem.js';

window.addEventListener('load', () => {
if (document.referrer) {
const { origin, pathname } = new URL(document.referrer);
Expand All @@ -26,9 +24,12 @@
btnContainer.append(backBtn);
}
}
sampleRUM('404', { source: document.referrer });
});
</script>
<script type="module">
import { sampleRUM } from '/scripts/aem.js';
sampleRUM('404', { source: document.referrer });
</script>
<link rel="stylesheet" href="/styles/styles.css">
<style>
main.error {
Expand Down
4 changes: 2 additions & 2 deletions blocks/fragment/fragment.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '../../scripts/scripts.js';

import {
loadBlocks,
loadSections,
} from '../../scripts/aem.js';

/**
Expand All @@ -34,7 +34,7 @@ export async function loadFragment(path) {
resetAttributeBase('source', 'srcset');

decorateMain(main);
await loadBlocks(main);
await loadSections(main);
return main;
}
}
Expand Down
123 changes: 79 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
},
"homepage": "https://github.com/adobe/aem-boilerplate#readme",
"devDependencies": {
"@babel/eslint-parser": "7.24.7",
"@babel/eslint-parser": "7.24.8",
"eslint": "8.57.0",
"eslint-config-airbnb-base": "15.0.0",
"eslint-plugin-import": "2.29.1",
"stylelint": "16.6.1",
"stylelint-config-standard": "36.0.0"
"stylelint": "16.7.0",
"stylelint-config-standard": "36.0.1"
}
}
Loading

0 comments on commit e150047

Please sign in to comment.