diff --git a/bundlesize.config.json b/bundlesize.config.json index f948135fa..23d7de240 100644 --- a/bundlesize.config.json +++ b/bundlesize.config.json @@ -2,7 +2,7 @@ "files": [ { "path": "./dist/*.bundle.js", - "maxSize": "600 kB" + "maxSize": "650 kB" } ] } diff --git a/package.json b/package.json index 16f00de7f..bcc7d7043 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "dependencies": { "@babel/runtime": "^7.3.4", "@rehooks/local-storage": "^2.1.1", + "@sentry/browser": "5.15.5", "classnames": "^2.2.5", "color-convert": "^1.9.2", "core-js": "^3.2.1", @@ -33,8 +34,6 @@ "nearley": "^2.19.0", "puppeteer": "^2.1.1", "ramda": "^0.25.0", - "raven-for-redux": "^1.3.1", - "raven-js": "^3.26.4", "react": "^16.8.6", "react-addons-css-transition-group": "^15.6.2", "react-color": "^2.14.0", @@ -58,6 +57,7 @@ "recharts": "^1.8.5", "reduce-reducers": "^1.0.4", "redux": "^4.0.4", + "redux-sentry-middleware": "^0.1.8", "redux-thunk": "^2.3.0", "regenerator-runtime": "^0.13.3", "reselect": "^4.0.0", diff --git a/source/sites/mon-entreprise.fr/App.tsx b/source/sites/mon-entreprise.fr/App.tsx index d0580c878..eb7e783d7 100644 --- a/source/sites/mon-entreprise.fr/App.tsx +++ b/source/sites/mon-entreprise.fr/App.tsx @@ -1,12 +1,12 @@ +import * as Sentry from '@sentry/browser' import Route404 from 'Components/Route404' import { SitePathsContext } from 'Components/utils/withSitePaths' import 'iframe-resizer' -import createRavenMiddleware from 'raven-for-redux' -import Raven from 'raven-js' import React, { useContext, useEffect } from 'react' import { Helmet } from 'react-helmet' import { useTranslation } from 'react-i18next' import { Route, Switch } from 'react-router-dom' +import createSentryMiddleware from 'redux-sentry-middleware' import 'Ui/index.css' import Provider, { ProviderProps } from '../../Provider' import { @@ -46,9 +46,8 @@ if (process.env.NODE_ENV === 'production') { process.env.HEAD && process.env.COMMIT_REF && process.env.HEAD + '-' + process.env.COMMIT_REF?.substring(0, 7) - const publicDSN = - 'https://9051375f856646d694943532caf2b45f@sentry.data.gouv.fr/18' - Raven.config(publicDSN, release ? { release } : {}).install() + const dsn = 'https://9051375f856646d694943532caf2b45f@sentry.data.gouv.fr/18' + Sentry.init({ dsn, release }) } let tracker = devTracker @@ -57,7 +56,7 @@ if (process.env.NODE_ENV === 'production') { } const middlewares = [ - createRavenMiddleware(Raven), + createSentryMiddleware(Sentry), trackSimulatorActions(tracker) ] diff --git a/yarn.lock b/yarn.lock index c7746e802..8806a33dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1137,6 +1137,58 @@ resolved "https://registry.yarnpkg.com/@rehooks/local-storage/-/local-storage-2.3.0.tgz#e2b90a93d3be70e7b7d69a5748abbcfa94261713" integrity sha512-Lt7uVEse+Rxc1OBTy/dxSJoNtik2CAP+9w+2G2EzY04S+HPkNaUvnIHtWMCniqzZ6ctthvRPs1Pcriuexmr56A== +"@sentry/browser@5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.15.5.tgz#d9a51f1388581067b50d30ed9b1aed2cbb333a36" + integrity sha512-rqDvjk/EvogfdbZ4TiEpxM/lwpPKmq23z9YKEO4q81+1SwJNua53H60dOk9HpRU8nOJ1g84TMKT2Ov8H7sqDWA== + dependencies: + "@sentry/core" "5.15.5" + "@sentry/types" "5.15.5" + "@sentry/utils" "5.15.5" + tslib "^1.9.3" + +"@sentry/core@5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.15.5.tgz#40ea79bff5272d3fbbeeb4a98cdc59e1adbd2c92" + integrity sha512-enxBLv5eibBMqcWyr+vApqeix8uqkfn0iGsD3piKvoMXCgKsrfMwlb/qo9Ox0lKr71qIlZVt+9/A2vZohdgnlg== + dependencies: + "@sentry/hub" "5.15.5" + "@sentry/minimal" "5.15.5" + "@sentry/types" "5.15.5" + "@sentry/utils" "5.15.5" + tslib "^1.9.3" + +"@sentry/hub@5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.15.5.tgz#f5abbcdbe656a70e2ff02c02a5a4cffa0f125935" + integrity sha512-zX9o49PcNIVMA4BZHe//GkbQ4Jx+nVofqU/Il32/IbwKhcpPlhGX3c1sOVQo4uag3cqd/JuQsk+DML9TKkN0Lw== + dependencies: + "@sentry/types" "5.15.5" + "@sentry/utils" "5.15.5" + tslib "^1.9.3" + +"@sentry/minimal@5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.15.5.tgz#a0e4e071f01d9c4d808094ae7203f6c4cca9348a" + integrity sha512-zQkkJ1l9AjmU/Us5IrOTzu7bic4sTPKCatptXvLSTfyKW7N6K9MPIIFeSpZf9o1yM2sRYdK7GV08wS2eCT3JYw== + dependencies: + "@sentry/hub" "5.15.5" + "@sentry/types" "5.15.5" + tslib "^1.9.3" + +"@sentry/types@5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.15.5.tgz#16c97e464cf09bbd1d2e8ce90d130e781709076e" + integrity sha512-F9A5W7ucgQLJUG4LXw1ZIy4iLevrYZzbeZ7GJ09aMlmXH9PqGThm1t5LSZlVpZvUfQ2rYA8NU6BdKJSt7B5LPw== + +"@sentry/utils@5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.15.5.tgz#dec1d4c79037c4da08b386f5d34409234dcbfb15" + integrity sha512-Nl9gl/MGnzSkuKeo3QaefoD/OJrFLB8HmwQ7HUbTXb6E7yyEzNKAQMHXGkwNAjbdYyYbd42iABP6Y5F/h39NtA== + dependencies: + "@sentry/types" "5.15.5" + tslib "^1.9.3" + "@sinonjs/commons@^1", "@sinonjs/commons@^1.3.0", "@sinonjs/commons@^1.7.0": version "1.7.2" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2" @@ -9405,12 +9457,7 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raven-for-redux@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/raven-for-redux/-/raven-for-redux-1.4.0.tgz#37cf4fc7bdde227ce5cc8fa29942f21ea517b7fb" - integrity sha512-BYe+nvctbC+6YgaP6hxMJci96bE3782ldGsXmLbw6uhOBDVV80t4Q2kPG613dbe2ldyXdrbpxLf9O/vKqusgww== - -raven-js@>=3.21.0, raven-js@^3.26.4: +raven-js@>=3.21.0: version "3.27.2" resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.2.tgz#6c33df952026cd73820aa999122b7b7737a66775" integrity sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ== @@ -9827,6 +9874,11 @@ reduce-reducers@^1.0.4: resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-1.0.4.tgz#fb77e751a9eb0201760ac5a605ca8c9c2d0537f8" integrity sha512-Mb2WZ2bJF597exiqX7owBzrqJ74DHLK3yOQjCyPAaNifRncE8OD0wFIuoMhXxTnHK07+8zZ2SJEKy/qtiyR7vw== +redux-sentry-middleware@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/redux-sentry-middleware/-/redux-sentry-middleware-0.1.8.tgz#29f71821c1fb87d4ebcb8f76067fea3c3738a64c" + integrity sha512-xubpYH9RgE31tZUESeRW5agwQa19Yd6Gy+4iO09raW/2TITPO5fhJdXpVwJfpGMbIYhEmHFqE2wD5Lnz7YtAeA== + redux-thunk@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" @@ -11430,7 +11482,7 @@ ts-toolbelt@^6.3.3: resolved "https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-6.3.12.tgz#2a9eb22759ef65d2ee3e01544f68059ea80917bf" integrity sha512-hxX5rMtZRLGdRrz0LpEJO37K/SiSBoT/P1xx3WW1vON3P8FMqsCHIxrbynyWlEWHQOsLENwKV9AfEBTBNcv4eg== -tslib@^1.9.0: +tslib@^1.9.0, tslib@^1.9.3: version "1.11.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==