diff --git a/conference.js b/conference.js index 17b3c621d..4410bd5d2 100644 --- a/conference.js +++ b/conference.js @@ -1,8 +1,8 @@ /* global APP, JitsiMeetJS, config, interfaceConfig */ import { jitsiLocalStorage } from '@jitsi/js-utils'; +import Logger from '@jitsi/logger'; import EventEmitter from 'events'; -import Logger from 'jitsi-meet-logger'; import { openConnection } from './connection'; import { ENDPOINT_TEXT_MESSAGE_NAME } from './modules/API/constants'; diff --git a/connection.js b/connection.js index f4fadd5c1..faa9344ae 100644 --- a/connection.js +++ b/connection.js @@ -1,7 +1,7 @@ /* global APP, JitsiMeetJS, config */ import { jitsiLocalStorage } from '@jitsi/js-utils'; -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import { redirectToTokenAuthService } from './modules/UI/authentication/AuthHandler'; import { LoginDialog } from './react/features/authentication/components'; diff --git a/modules/API/API.js b/modules/API/API.js index 41f1cb28e..6a286fa2c 100644 --- a/modules/API/API.js +++ b/modules/API/API.js @@ -1,6 +1,6 @@ // @flow -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import { createApiEvent, diff --git a/modules/API/external/functions.js b/modules/API/external/functions.js index ebbb2a1e0..144c666ae 100644 --- a/modules/API/external/functions.js +++ b/modules/API/external/functions.js @@ -1,6 +1,6 @@ // @flow -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; const logger = Logger.getLogger(__filename); diff --git a/modules/UI/UI.js b/modules/UI/UI.js index 7f1ad64d9..6198da6aa 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -3,8 +3,8 @@ const UI = {}; +import Logger from '@jitsi/logger'; import EventEmitter from 'events'; -import Logger from 'jitsi-meet-logger'; import { isMobileBrowser } from '../../react/features/base/environment/utils'; import { setColorAlpha } from '../../react/features/base/util'; diff --git a/modules/UI/authentication/AuthHandler.js b/modules/UI/authentication/AuthHandler.js index e459184cf..a71f1c59b 100644 --- a/modules/UI/authentication/AuthHandler.js +++ b/modules/UI/authentication/AuthHandler.js @@ -1,6 +1,6 @@ // @flow -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import { openConnection } from '../../../connection'; import { diff --git a/modules/UI/videolayout/LargeVideoManager.js b/modules/UI/videolayout/LargeVideoManager.js index 91adcac44..f3f176ecf 100644 --- a/modules/UI/videolayout/LargeVideoManager.js +++ b/modules/UI/videolayout/LargeVideoManager.js @@ -1,6 +1,6 @@ /* global $, APP */ /* eslint-disable no-unused-vars */ -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import React from 'react'; import ReactDOM from 'react-dom'; import { I18nextProvider } from 'react-i18next'; diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js index ddc94f035..e62083fd6 100644 --- a/modules/UI/videolayout/VideoLayout.js +++ b/modules/UI/videolayout/VideoLayout.js @@ -1,6 +1,6 @@ /* global APP */ -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import { MEDIA_TYPE, VIDEO_TYPE } from '../../../react/features/base/media'; import { diff --git a/modules/keyboardshortcut/keyboardshortcut.js b/modules/keyboardshortcut/keyboardshortcut.js index b6cc06276..91bfc5462 100644 --- a/modules/keyboardshortcut/keyboardshortcut.js +++ b/modules/keyboardshortcut/keyboardshortcut.js @@ -1,6 +1,6 @@ /* global APP */ import { jitsiLocalStorage } from '@jitsi/js-utils'; -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import { ACTION_SHORTCUT_PRESSED as PRESSED, diff --git a/modules/util/TaskQueue.js b/modules/util/TaskQueue.js index 9bc684301..aadcfd6fb 100644 --- a/modules/util/TaskQueue.js +++ b/modules/util/TaskQueue.js @@ -1,4 +1,4 @@ -const logger = require('jitsi-meet-logger').getLogger(__filename); +const logger = require('@jitsi/logger').getLogger(__filename); /** * Manages a queue of functions where the current function in progress will diff --git a/package-lock.json b/package-lock.json index 3eb4210f7..0397f5525 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,7 @@ "@atlaskit/tooltip": "17.1.2", "@hapi/bourne": "2.0.0", "@jitsi/js-utils": "2.0.0", + "@jitsi/logger": "2.0.0", "@material-ui/core": "4.11.3", "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz", "@microsoft/microsoft-graph-client": "1.1.0", @@ -55,7 +56,6 @@ "i18next-browser-languagedetector": "3.0.1", "i18next-xhr-backend": "3.0.0", "image-capture": "0.4.0", - "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#v1.0.0", "jquery": "3.5.1", "jquery-i18next": "1.2.1", "js-md5": "0.6.1", @@ -3366,6 +3366,11 @@ "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz", "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" }, + "node_modules/@jitsi/logger": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@jitsi/logger/-/logger-2.0.0.tgz", + "integrity": "sha512-QZE0NpI/GKRdZK0vhuyFYWr4XkCz4slihkSfy6RTszjj/YEHZKIV7yGJo6Hbs3kYI2h5v7apoy+h2WCOMumPJw==" + }, "node_modules/@jitsi/sdp-interop": { "version": "1.0.5", "resolved": "git+ssh://git@github.com/jitsi/sdp-interop.git#4669790bb9020cc8f10c1d1f3823c26b08497547", @@ -22711,6 +22716,11 @@ } } }, + "@jitsi/logger": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@jitsi/logger/-/logger-2.0.0.tgz", + "integrity": "sha512-QZE0NpI/GKRdZK0vhuyFYWr4XkCz4slihkSfy6RTszjj/YEHZKIV7yGJo6Hbs3kYI2h5v7apoy+h2WCOMumPJw==" + }, "@jitsi/sdp-interop": { "version": "git+ssh://git@github.com/jitsi/sdp-interop.git#4669790bb9020cc8f10c1d1f3823c26b08497547", "integrity": "sha512-4nqEqJWyRFjHM/riI0DQRNx+mgx277iK0r5LhwVAHDZDBYbLN54vYcfZ6JepcmygQiixa8jet/gLJnikdH9wzQ==", diff --git a/package.json b/package.json index 47071f8ba..0ff9c2f06 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@atlaskit/tooltip": "17.1.2", "@hapi/bourne": "2.0.0", "@jitsi/js-utils": "2.0.0", + "@jitsi/logger": "2.0.0", "@material-ui/core": "4.11.3", "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz", "@microsoft/microsoft-graph-client": "1.1.0", @@ -60,7 +61,6 @@ "i18next-browser-languagedetector": "3.0.1", "i18next-xhr-backend": "3.0.0", "image-capture": "0.4.0", - "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#v1.0.0", "jquery": "3.5.1", "jquery-i18next": "1.2.1", "js-md5": "0.6.1", diff --git a/react/features/base/logging/JitsiMeetLogStorage.js b/react/features/base/logging/JitsiMeetLogStorage.js index 72487fa65..9021e5270 100644 --- a/react/features/base/logging/JitsiMeetLogStorage.js +++ b/react/features/base/logging/JitsiMeetLogStorage.js @@ -2,7 +2,7 @@ import { getCurrentConference } from '../conference'; /** - * Implements log storage interface from the jitsi-meet-logger lib. Captured + * Implements log storage interface from the @jitsi/logger lib. Captured * logs are sent to CallStats. */ export default class JitsiMeetLogStorage { diff --git a/react/features/base/logging/LogTransport.native.js b/react/features/base/logging/LogTransport.native.js index eb1078c06..01ece062d 100644 --- a/react/features/base/logging/LogTransport.native.js +++ b/react/features/base/logging/LogTransport.native.js @@ -26,7 +26,7 @@ function stackToString(e) { } /** - * Constructs a log transport object for use with jitsi-meet-logger. + * Constructs a log transport object for use with @jitsi/logger. * * @returns {Object} - The transport object. */ diff --git a/react/features/base/logging/functions.js b/react/features/base/logging/functions.js index e9aab16f3..211cbba1a 100644 --- a/react/features/base/logging/functions.js +++ b/react/features/base/logging/functions.js @@ -1,6 +1,6 @@ // @flow -import Logger, { getLogger as _getLogger } from 'jitsi-meet-logger'; +import Logger, { getLogger as _getLogger } from '@jitsi/logger'; import _ from 'lodash'; import LogTransport from './LogTransport'; diff --git a/react/features/base/logging/middleware.js b/react/features/base/logging/middleware.js index 8fc8f3730..545ae177c 100644 --- a/react/features/base/logging/middleware.js +++ b/react/features/base/logging/middleware.js @@ -1,6 +1,6 @@ /* @flow */ -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import { APP_WILL_MOUNT } from '../app'; import { CONFERENCE_JOINED, getCurrentConference } from '../conference'; diff --git a/react/features/dynamic-branding/actions.js b/react/features/dynamic-branding/actions.js index 705708b3e..4a8df56cc 100644 --- a/react/features/dynamic-branding/actions.js +++ b/react/features/dynamic-branding/actions.js @@ -1,6 +1,6 @@ // @flow -import { getLogger } from 'jitsi-meet-logger'; +import { getLogger } from '@jitsi/logger'; import { doGetJSON } from '../base/util'; diff --git a/react/features/mobile/polyfills/browser.js b/react/features/mobile/polyfills/browser.js index ab4a2670b..1cba945a3 100644 --- a/react/features/mobile/polyfills/browser.js +++ b/react/features/mobile/polyfills/browser.js @@ -281,7 +281,7 @@ function _visitNode(node, callback) { const { console } = global; if (console) { - const loggerLevels = require('jitsi-meet-logger').levels; + const loggerLevels = require('@jitsi/logger').levels; Object.keys(loggerLevels).forEach(key => { const level = loggerLevels[key]; diff --git a/react/features/shared-video/components/native/VideoManager.js b/react/features/shared-video/components/native/VideoManager.js index 1e70b839d..bc2aa01de 100644 --- a/react/features/shared-video/components/native/VideoManager.js +++ b/react/features/shared-video/components/native/VideoManager.js @@ -1,4 +1,4 @@ -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import React from 'react'; import Video from 'react-native-video'; diff --git a/react/features/shared-video/components/web/AbstractVideoManager.js b/react/features/shared-video/components/web/AbstractVideoManager.js index e86403048..d23358887 100644 --- a/react/features/shared-video/components/web/AbstractVideoManager.js +++ b/react/features/shared-video/components/web/AbstractVideoManager.js @@ -1,6 +1,6 @@ /* @flow */ /* eslint-disable no-invalid-this */ -import Logger from 'jitsi-meet-logger'; +import Logger from '@jitsi/logger'; import throttle from 'lodash/throttle'; import { PureComponent } from 'react'; diff --git a/react/features/video-menu/actions.any.js b/react/features/video-menu/actions.any.js index 27fe4dfe2..c63e919f5 100644 --- a/react/features/video-menu/actions.any.js +++ b/react/features/video-menu/actions.any.js @@ -1,5 +1,5 @@ // @flow -import { getLogger } from 'jitsi-meet-logger'; +import { getLogger } from '@jitsi/logger'; import type { Dispatch } from 'redux'; import UIEvents from '../../../service/UI/UIEvents';