From bbb7dc0472b27c9934237da7f9d980350b5dd4be Mon Sep 17 00:00:00 2001 From: kyranjamie Date: Wed, 17 May 2023 10:45:00 +0200 Subject: [PATCH] refactor: improve logging --- package.json | 6 ++-- .../common/hooks/analytics/use-analytics.ts | 4 +-- src/shared/logger.ts | 3 +- webpack/dev-server.js | 5 ++- webpack/webpack.config.base.js | 5 ++- yarn.lock | 33 ++++++++----------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 53610d7e..e3420a5a 100644 --- a/package.json +++ b/package.json @@ -194,7 +194,7 @@ "mdi-react": "7.5.0", "micro-packed": "0.3.2", "object-hash": "3.0.0", - "pino": "8.8.0", + "pino": "8.14.1", "prismjs": "1.29.0", "promise-memoize": "1.2.1", "punycode": "2.3.0", @@ -209,7 +209,7 @@ "react-router-dom": "6.11.1", "react-virtuoso": "4.0.8", "redux-persist": "6.0.0", - "rxjs": "7.8.0", + "rxjs": "7.8.1", "ts-debounce": "4.0.0", "use-events": "1.4.2", "use-latest": "1.2.1", @@ -322,7 +322,7 @@ "webpack": "5.81.0", "webpack-bundle-analyzer": "4.8.0", "webpack-cli": "5.0.2", - "webpack-dev-server": "4.13.3", + "webpack-dev-server": "4.15.0", "webpack-hot-middleware": "2.25.3" }, "resolutions": { diff --git a/src/app/common/hooks/analytics/use-analytics.ts b/src/app/common/hooks/analytics/use-analytics.ts index 0d68e418..b38d99c3 100644 --- a/src/app/common/hooks/analytics/use-analytics.ts +++ b/src/app/common/hooks/analytics/use-analytics.ts @@ -63,7 +63,7 @@ export function useAnalytics() { const [category, name, properties, options, ...rest] = args; const prop = { ...defaultProperties, ...properties }; const opts = { ...defaultOptions, ...options }; - logger.info(`Analytics page view: ${name}`, properties); + logger.debug(`Analytics page view: ${name}`, properties); if (typeof name === 'string' && isIgnoredPath(name)) return; @@ -74,7 +74,7 @@ export function useAnalytics() { const [eventName, properties, options, ...rest] = args; const prop = { ...defaultProperties, ...properties }; const opts = { ...defaultOptions, ...options }; - logger.info(`Analytics event: ${eventName}`, properties); + logger.debug(`Analytics event: ${eventName}`, properties); return analytics.track(eventName, prop, opts, ...rest).catch(logger.error); }, diff --git a/src/shared/logger.ts b/src/shared/logger.ts index df183b1e..cf976e6a 100644 --- a/src/shared/logger.ts +++ b/src/shared/logger.ts @@ -20,8 +20,9 @@ logs$ const pinoLogger = pino({ enabled: !IS_TEST_ENV, + level: 'info', browser: { - asObject: true, + asObject: false, transmit: { level: 'info', send(_level, logEvent) { diff --git a/webpack/dev-server.js b/webpack/dev-server.js index 09d012f0..5b80e36e 100644 --- a/webpack/dev-server.js +++ b/webpack/dev-server.js @@ -37,7 +37,10 @@ const server = new WebpackDevServer( // Disabled as web configure manually above hot: false, // We disable client bc we do a manual setup for specific entries - client: false, + client: { + overlay: false, + logging: 'none', + }, port: process.env.PORT, static: { directory: path.join(__dirname, '../build'), diff --git a/webpack/webpack.config.base.js b/webpack/webpack.config.base.js index c7e8d12a..d2fe1423 100755 --- a/webpack/webpack.config.base.js +++ b/webpack/webpack.config.base.js @@ -209,7 +209,10 @@ const config = { ], }), new CopyWebpackPlugin({ - patterns: [{ from: 'node_modules/webextension-polyfill/dist/browser-polyfill.js' }], + patterns: [ + { from: 'node_modules/webextension-polyfill/dist/browser-polyfill.js' }, + { from: 'node_modules/webextension-polyfill/dist/browser-polyfill.js.map' }, + ], }), new Dotenv({ diff --git a/yarn.lock b/yarn.lock index e7aaca8a..47b42de4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14473,10 +14473,10 @@ pino@8.11.0: sonic-boom "^3.1.0" thread-stream "^2.0.0" -pino@8.7.0: - version "8.7.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-8.7.0.tgz#58621608a3d8540ae643cdd9194cdd94130c78d9" - integrity sha512-l9sA5uPxmZzwydhMWUcm1gI0YxNnYl8MfSr2h8cwLvOAzQLBLewzF247h/vqHe3/tt6fgtXeG9wdjjoetdI/vA== +pino@8.14.1: + version "8.14.1" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.14.1.tgz#bb38dcda8b500dd90c1193b6c9171eb777a47ac8" + integrity sha512-8LYNv7BKWXSfS+k6oEc6occy5La+q2sPwU3q2ljTX5AZk7v+5kND2o5W794FyRaqha6DJajmkNRsWtPpFyMUdw== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1" @@ -14490,10 +14490,10 @@ pino@8.7.0: sonic-boom "^3.1.0" thread-stream "^2.0.0" -pino@8.8.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-8.8.0.tgz#1f0d6695a224aa06afc7ad60f2ccc4772d3b9233" - integrity sha512-cF8iGYeu2ODg2gIwgAHcPrtR63ILJz3f7gkogaHC/TXVVXxZgInmNYiIpDYEwgEkxZti2Se6P2W2DxlBIZe6eQ== +pino@8.7.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.7.0.tgz#58621608a3d8540ae643cdd9194cdd94130c78d9" + integrity sha512-l9sA5uPxmZzwydhMWUcm1gI0YxNnYl8MfSr2h8cwLvOAzQLBLewzF247h/vqHe3/tt6fgtXeG9wdjjoetdI/vA== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1" @@ -15558,14 +15558,7 @@ rxjs@6: dependencies: tslib "^1.9.0" -rxjs@7.8.0: - version "7.8.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" - integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== - dependencies: - tslib "^2.1.0" - -rxjs@^7.0.0, rxjs@^7.5.4: +rxjs@7.8.1, rxjs@^7.0.0, rxjs@^7.5.4: version "7.8.1" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== @@ -17608,10 +17601,10 @@ webpack-dev-middleware@^5.3.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@4.13.3: - version "4.13.3" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.13.3.tgz#9feb740b8b56b886260bae1360286818a221bae8" - integrity sha512-KqqzrzMRSRy5ePz10VhjyL27K2dxqwXQLP5rAKwRJBPUahe7Z2bBWzHw37jeb8GCPKxZRO79ZdQUAPesMh/Nug== +webpack-dev-server@4.15.0: + version "4.15.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz#87ba9006eca53c551607ea0d663f4ae88be7af21" + integrity sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5"