Override matomo window object #6411
+27
−19
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,12 @@ import { localStorageFS } from '../files/filesystems/localStorage' | |
| import { fileSystemUtility, migrationTestData } from '../files/filesystems/fileSystemUtility' | ||
| import './styles/preload.css' | ||
| import isElectron from 'is-electron' | ||
| import { Matomo } from '../plugins/matomo' | ||
|
|
||
| const _paq = (window._paq = window._paq || []) | ||
| const matomo = new Matomo(_paq) | ||
|
|
||
| window._paq = matomo | ||
|
There was a problem hiding this comment. Redefining window._paq here may be tricky, we don't actually know if loader.js has completed its task async loading the tracker code into _paq, and if the window._paq init object has been properly handled by the matomo initializing script. the point of matomo async loading is prevent any delays that would be caused by sync loading the script. so at this point the _paq may just be an array of the init we set in loader, it may not be the tracker at all @yann300 @ioedeveloper |
||
|
|
||
| // _paq.push(['trackEvent', 'App', 'Preload', 'start']) | ||
|
|
||
|
|
@@ -34,13 +39,13 @@ export const Preload = (props: any) => { | |
| function loadAppComponent() { | ||
| import('../../app') | ||
| .then((AppComponent) => { | ||
| const appComponent = new AppComponent.default(matomo) | ||
| appComponent.run().then(() => { | ||
| props.root.render(<RemixApp app={appComponent} />) | ||
| }) | ||
| }) | ||
| .catch((err) => { | ||
| matomo.push(['trackEvent', 'App', 'PreloadError', err && err.message]) | ||
| console.error('Error loading Remix:', err) | ||
| setError(true) | ||
| }) | ||
|
|
@@ -68,10 +73,10 @@ export const Preload = (props: any) => { | |
| ]) | ||
| if (fsLoaded) { | ||
| console.log(fsLoaded.name + ' activated') | ||
| matomo.push(['trackEvent', 'Storage', 'activate', fsLoaded.name]) | ||
| loadAppComponent() | ||
| } else { | ||
| matomo.push(['trackEvent', 'Storage', 'error', 'no supported storage']) | ||
| setSupported(false) | ||
| } | ||
| } | ||
|
|
@@ -89,8 +94,8 @@ export const Preload = (props: any) => { | |
| return | ||
| } | ||
| async function loadStorage() { | ||
| ;(await remixFileSystems.current.addFileSystem(remixIndexedDB.current)) || matomo.push(['trackEvent', 'Storage', 'error', 'indexedDB not supported']) | ||
| ;(await remixFileSystems.current.addFileSystem(localStorageFileSystem.current)) || matomo.push(['trackEvent', 'Storage', 'error', 'localstorage not supported']) | ||
| await testmigration() | ||
| remixIndexedDB.current.loaded && (await remixIndexedDB.current.checkWorkspaces()) | ||
| localStorageFileSystem.current.loaded && (await localStorageFileSystem.current.checkWorkspaces()) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wouldn't that slow down the loading? did you notice some latency?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it does not slow it down.