Skip to content

Commit 6dfcce5

Browse files
buberddsbuberdds
authored
Merge pull request #2434 from oasisprotocol/mz/matomo
Remove Matomo analytics and fix towncrier in CI
2 parents c658c79 + a2c2f3e commit 6dfcce5

File tree

21 files changed

+24
-570
lines changed

21 files changed

+24
-570
lines changed

‎.changelog/2434.internal.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove Matomo analytics and fix Towncrier in CI

‎.env‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ REACT_APP_BUILD_DATETIME=0
22
REACT_APP_BUILD_SHA=sha0000000000000000000000000000000000000
33
REACT_APP_BUILD_VERSION=
44
REACT_APP_PRIVACY_POLICY=https://oasisprotocol.org/privacy-policy
5-
REACT_APP_ENABLE_OASIS_MATOMO_ANALYTICS=true
65
# REACT_APP_API=http://localhost:8008/v1/
76
# REACT_APP_API=https://nexus.stg.oasis.io/v1/
87
# REACT_APP_TESTNET_API=https://testnet.nexus.stg.oasis.io/v1/

‎.env.production‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ REACT_APP_BUILD_DATETIME=
22
REACT_APP_BUILD_SHA=
33
REACT_APP_BUILD_VERSION=
44
REACT_APP_PRIVACY_POLICY=https://oasisprotocol.org/privacy-policy
5-
REACT_APP_ENABLE_OASIS_MATOMO_ANALYTICS=true
65
REACT_APP_META_TITLE="Oasis Explorer"
76
REACT_APP_META_IMAGE="Oasis Explorer - OpenGraph Banner.png"
87
REACT_APP_META_MANIFEST=app.webmanifest

‎.eslintrc.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,6 @@ const config = {
4646
],
4747
},
4848
],
49-
'no-restricted-syntax': [
50-
'error',
51-
{
52-
selector:
53-
'MemberExpression[object.object.name="process"][object.property.name="env"][property.name="REACT_APP_ENABLE_OASIS_MATOMO_ANALYTICS"]',
54-
message:
55-
'Replace with window.REACT_APP_ENABLE_OASIS_MATOMO_ANALYTICS to support overriding in e2e tests',
56-
},
57-
],
5849
'prefer-template': 'error',
5950

6051
'react/jsx-no-target-blank': 'off', // Not needed with modern browsers

‎.github/workflows/ci-lint.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ jobs:
4343
- name: Install gitlint
4444
run: |
4545
python -m pip install gitlint
46-
# Needed for Towncrier fork to work with 3.12 and above
46+
# Needed for Towncrier fork to work with 3.12 and above.
47+
# As of version 82.0.0, pkg_resources is no longer available.
4748
- name: Install setuptools
4849
run: |
49-
python -m pip install setuptools
50+
python -m pip install "setuptools<=81.0.0"
5051
- name: Install towncrier
5152
run: |
5253
python -m pip install https://github.com/oasisprotocol/towncrier/archive/oasis-master.tar.gz

‎index.html‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<body>
1919
<noscript>You need to enable JavaScript to run this app.</noscript>
2020
<div id="root"></div>
21-
<script>
22-
// Allow e2e tests to pre-define it in runtime
23-
window.REACT_APP_ENABLE_OASIS_MATOMO_ANALYTICS ??= '%REACT_APP_ENABLE_OASIS_MATOMO_ANALYTICS%'
24-
</script>
2521
<script type="module" src="/src/index.tsx"></script>
2622
</body>
2723
</html>

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
"events": "^3.1.0",
9494
"jsdom": "^26.1.0",
9595
"markdownlint-cli": "0.44.0",
96-
"matomo-js-client-types": "5.0.0",
9796
"node-fetch": "2.7.0",
9897
"prettier": "3.5.3",
9998
"process": "0.11.10",

‎playwright/tests/analytics.spec.ts‎

Lines changed: 0 additions & 182 deletions
This file was deleted.

‎src/app/components/AnalyticsConsent/AnalyticsDialogLayout.tsx‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/app/components/AnalyticsConsent/AnalyticsIsBlocked.tsx‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)