diff --git a/.eslintrc.js b/.eslintrc.js index 7b77b6c89..753e3e608 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -39,7 +39,7 @@ module.exports = { 'files': ['src/**/*.js', 'src/**/*.jsx'] } ], - 'ignorePatterns': ['src/vendor/**/*.js', 'src/settings.js'], + 'ignorePatterns': ['src/settings.js'], 'settings': { 'react': { 'version': 'detect' diff --git a/eslint.config.mjs b/eslint.config.mjs index 126bb1f97..5ebf92a64 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -18,7 +18,7 @@ const compat = new FlatCompat({ }); export default [{ - ignores: ["src/vendor/**/*.js", "src/settings.js"], + ignores: ["src/settings.js"], }, ...compat.extends( "eslint:recommended", "plugin:react/recommended", diff --git a/script/clean b/script/clean index 72d4c140a..0454a39a4 100755 --- a/script/clean +++ b/script/clean @@ -2,7 +2,6 @@ cd "$(dirname "$0")/.." || exit 111 [[ -d ./node_modules/ ]] && rm -rf ./node_modules/ -[[ -d ./vendor/ ]] && rm -rf ./vendor/ [[ -d ./dev/ ]] && rm -rf ./dev/ [[ -d ./dist/ ]] && rm -rf ./dist/ [[ -d ./coverage/ ]] && rm -rf ./coverage/ diff --git a/src/app/contexts/user.ts b/src/app/contexts/user.ts index 82e80b4e7..7e340a7a8 100644 --- a/src/app/contexts/user.ts +++ b/src/app/contexts/user.ts @@ -73,7 +73,7 @@ function useContextValue() { }; if (model && model.id) { - w.pi('identify_client', model.id); + w.pi?.('identify_client', model.id); } }, [model]); diff --git a/src/app/helpers/tag-manager.js b/src/app/helpers/tag-manager.js index 9e6319289..5c530aa3a 100644 --- a/src/app/helpers/tag-manager.js +++ b/src/app/helpers/tag-manager.js @@ -3,6 +3,24 @@ const tagManagerID = 'GTM-W6N7PB'; window.dataLayer ||= []; +function gtag(...args) { + window.dataLayer.push(...args); +} +/* eslint-disable camelcase */ +gtag('consent', 'default', { + ad_storage: 'denied', + ad_user_data: 'denied', + ad_personalization: 'denied', + analytics_storage: 'denied', + functionality_storage: 'denied', + personalization_storage: 'denied', + security_storage: 'granted', + wait_for_update: 2000 +}); +gtag('set', 'ads_data_redaction', true); +gtag('set', 'url_passthrough', false); +/* eslint-enable camelcase */ + window.oxDLF ||= []; // eslint-disable-next-line max-params diff --git a/src/app/main.js b/src/app/main.js index 579ecfe20..c7a0ce24f 100644 --- a/src/app/main.js +++ b/src/app/main.js @@ -17,12 +17,6 @@ window.SETTINGS = {}; } } - await Promise.all([ - import('../vendor/pardot'), - import('../vendor/pulseinsights'), - import('../vendor/facebook') - ]); - const isSupported = (await import('./helpers/device')).default; const appElement = (await import('/src/app/components/shell/shell')).default; diff --git a/src/vendor/facebook.js b/src/vendor/facebook.js deleted file mode 100644 index 3ba0cfce9..000000000 --- a/src/vendor/facebook.js +++ /dev/null @@ -1,13 +0,0 @@ -!(function (f, b, e, v, n, t, s) { - if (f.fbq) {return;} n=f.fbq=function () { - n.callMethod? - n.callMethod.apply(n, arguments):n.queue.push(arguments); - }; - if (!f._fbq) {f._fbq=n;}n.push=n; n.loaded=!0; n.version='2.0'; - n.queue=[]; t=b.createElement(e); t.async=!0; - t.src=v; s=b.getElementsByTagName(e)[0]; - s.parentNode.insertBefore(t, s); -})(window, document, 'script', - 'https://connect.facebook.net/en_US/fbevents.js'); -fbq('init', '560465674310764'); -fbq('track', 'PageView'); diff --git a/src/vendor/pardot.js b/src/vendor/pardot.js deleted file mode 100644 index 0ec529e02..000000000 --- a/src/vendor/pardot.js +++ /dev/null @@ -1,13 +0,0 @@ -// Expect required variables to be set in settings.js -(function () { - function async_load() { - const s = document.createElement('script'); - - s.type = 'text/javascript'; - s.src = `${'https:' == document.location.protocol ? 'https://pi' : 'http://cdn'}.pardot.com/pd.js`; - const c = document.getElementsByTagName('script')[0]; - - c.parentNode.insertBefore(s, c); - } - if (window.attachEvent) {window.attachEvent('onload', async_load);} else {window.addEventListener('load', async_load, false);} -})(); diff --git a/src/vendor/pulseinsights.js b/src/vendor/pulseinsights.js deleted file mode 100644 index 9bc4f7551..000000000 --- a/src/vendor/pulseinsights.js +++ /dev/null @@ -1,18 +0,0 @@ -(function () { - const w = window; const d = document; - - w.pi=function () { - w.pi.commands = w.pi.commands || []; - w.pi.commands.push(arguments); - }; - const s = d.createElement('script'); - - s.async = 1; - s.src = '//js.pulseinsights.com/surveys.js'; - const f = d.getElementsByTagName('script')[0]; - - f.parentNode.insertBefore(s, f); - - pi('identify', 'PI-16384954'); - pi('get', 'surveys'); -})();