diff --git a/connection.js b/connection.js index 1f8b43117..dbae44694 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 { jitsiLocalStorage } from 'js-utils'; import AuthHandler from './modules/UI/authentication/AuthHandler'; import { diff --git a/modules/UI/util/MessageHandler.js b/modules/UI/util/MessageHandler.js index f9f9cb3cf..1f446420a 100644 --- a/modules/UI/util/MessageHandler.js +++ b/modules/UI/util/MessageHandler.js @@ -1,7 +1,7 @@ /* global $, APP */ +import { jitsiLocalStorage } from '@jitsi/js-utils'; import Logger from 'jitsi-meet-logger'; -import { jitsiLocalStorage } from 'js-utils'; import { NOTIFICATION_TIMEOUT, diff --git a/modules/transport/index.js b/modules/transport/index.js index 2af297f41..e79d459c1 100644 --- a/modules/transport/index.js +++ b/modules/transport/index.js @@ -1,6 +1,6 @@ // FIXME: change to '../API' when we update to webpack2. If we do this now all // files from API modules will be included in external_api.js. -import { PostMessageTransportBackend, Transport } from 'js-utils/transport'; +import { PostMessageTransportBackend, Transport } from '@jitsi/js-utils/transport'; import { getJitsiMeetGlobalNS } from '../../react/features/base/util'; import { API_ID } from '../API/constants'; diff --git a/package-lock.json b/package-lock.json index a59356255..f2c6a450e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2832,6 +2832,23 @@ "@types/yargs": "^13.0.0" } }, + "@jitsi/js-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-1.0.0.tgz", + "integrity": "sha512-at9GPMP7IL0v6QS1Gs9c5MbbiN2AT0uKzsgKM8qS2wqXxqvpfT3p4U3+LH2IUyXiHlkmvlBMcNM02MltBdyRmQ==", + "requires": { + "bowser": "2.7.0", + "js-md5": "0.7.3", + "postis": "2.2.0" + }, + "dependencies": { + "js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" + } + } + }, "@jitsi/sdp-interop": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@jitsi/sdp-interop/-/sdp-interop-1.0.3.tgz", diff --git a/package.json b/package.json index 816c36b09..4d367aa58 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@atlaskit/theme": "7.0.2", "@atlaskit/toggle": "5.0.14", "@atlaskit/tooltip": "12.1.13", + "@jitsi/js-utils": "1.0.0", "@microsoft/microsoft-graph-client": "1.1.0", "@react-native-community/async-storage": "1.3.4", "@react-native-community/google-signin": "3.0.1", @@ -54,7 +55,6 @@ "jquery-contextmenu": "2.4.5", "jquery-i18next": "1.2.1", "js-md5": "0.6.1", - "js-utils": "github:jitsi/js-utils#cf11996bd866fdb47326c59a5d3bc24be17282d4", "jwt-decode": "2.2.0", "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#fb997564a64ecdc19a35f3bcc1ea4156ca9ccb5f", "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d", diff --git a/react/features/app/getRouteToRender.js b/react/features/app/getRouteToRender.js index a4bcdd5f4..1ff70a906 100644 --- a/react/features/app/getRouteToRender.js +++ b/react/features/app/getRouteToRender.js @@ -1,6 +1,6 @@ // @flow -import { generateRoomWithoutSeparator } from 'js-utils/random'; +import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random'; import type { Component } from 'react'; import { isRoomValid } from '../base/conference'; diff --git a/react/features/base/app/components/BaseApp.js b/react/features/base/app/components/BaseApp.js index e01a091df..c6af96180 100644 --- a/react/features/base/app/components/BaseApp.js +++ b/react/features/base/app/components/BaseApp.js @@ -1,6 +1,6 @@ // @flow -import { jitsiLocalStorage } from 'js-utils'; +import { jitsiLocalStorage } from '@jitsi/js-utils'; import _ from 'lodash'; import React, { Component, Fragment } from 'react'; import { I18nextProvider } from 'react-i18next'; diff --git a/react/features/base/config/actions.js b/react/features/base/config/actions.js index 0c5f930ab..d890ecbed 100644 --- a/react/features/base/config/actions.js +++ b/react/features/base/config/actions.js @@ -1,6 +1,6 @@ // @flow -import { jitsiLocalStorage } from 'js-utils'; +import { jitsiLocalStorage } from '@jitsi/js-utils'; import type { Dispatch } from 'redux'; import { addKnownDomains } from '../known-domains'; diff --git a/react/features/base/config/functions.any.js b/react/features/base/config/functions.any.js index ff5a448f9..1db8102a5 100644 --- a/react/features/base/config/functions.any.js +++ b/react/features/base/config/functions.any.js @@ -1,6 +1,6 @@ // @flow -import { jitsiLocalStorage } from 'js-utils'; +import { jitsiLocalStorage } from '@jitsi/js-utils'; import _ from 'lodash'; import { parseURLParams } from '../util'; diff --git a/react/features/base/config/middleware.js b/react/features/base/config/middleware.js index 4fb82b3b3..2a86a8240 100644 --- a/react/features/base/config/middleware.js +++ b/react/features/base/config/middleware.js @@ -1,6 +1,6 @@ // @flow -import { jitsiLocalStorage } from 'js-utils'; +import { jitsiLocalStorage } from '@jitsi/js-utils'; import { APP_WILL_MOUNT } from '../app'; import { getFeatureFlag } from '../flags/functions'; diff --git a/react/features/base/participants/functions.js b/react/features/base/participants/functions.js index c554e7228..afb1aa78a 100644 --- a/react/features/base/participants/functions.js +++ b/react/features/base/participants/functions.js @@ -1,5 +1,6 @@ // @flow -import { getGravatarURL } from 'js-utils/avatar'; + +import { getGravatarURL } from '@jitsi/js-utils/avatar'; import { JitsiParticipantConnectionStatus } from '../lib-jitsi-meet'; import { MEDIA_TYPE, shouldRenderVideoTrack } from '../media'; diff --git a/react/features/base/redux/PersistenceRegistry.js b/react/features/base/redux/PersistenceRegistry.js index 441a688dd..34313172d 100644 --- a/react/features/base/redux/PersistenceRegistry.js +++ b/react/features/base/redux/PersistenceRegistry.js @@ -1,7 +1,7 @@ // @flow +import { jitsiLocalStorage } from '@jitsi/js-utils'; import md5 from 'js-md5'; -import { jitsiLocalStorage } from 'js-utils'; import logger from './logger'; diff --git a/react/features/base/settings/reducer.js b/react/features/base/settings/reducer.js index 9e81470e5..a52412e5b 100644 --- a/react/features/base/settings/reducer.js +++ b/react/features/base/settings/reducer.js @@ -1,7 +1,7 @@ // @flow -import { jitsiLocalStorage } from 'js-utils'; -import { randomHexString } from 'js-utils/random'; +import { jitsiLocalStorage } from '@jitsi/js-utils'; +import { randomHexString } from '@jitsi/js-utils/random'; import _ from 'lodash'; import { APP_WILL_MOUNT } from '../app/actionTypes'; diff --git a/react/features/calendar-sync/actions.native.js b/react/features/calendar-sync/actions.native.js index 344a8d4ec..1ea63aae8 100644 --- a/react/features/calendar-sync/actions.native.js +++ b/react/features/calendar-sync/actions.native.js @@ -1,5 +1,5 @@ // @flow -import { generateRoomWithoutSeparator } from 'js-utils/random'; +import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random'; import type { Dispatch } from 'redux'; import { getDefaultURL } from '../app/functions'; diff --git a/react/features/calendar-sync/actions.web.js b/react/features/calendar-sync/actions.web.js index 3c9189759..ad3a4e3e8 100644 --- a/react/features/calendar-sync/actions.web.js +++ b/react/features/calendar-sync/actions.web.js @@ -1,6 +1,6 @@ // @flow -import { generateRoomWithoutSeparator } from 'js-utils/random'; +import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random'; import type { Dispatch } from 'redux'; import { createCalendarConnectedEvent, sendAnalytics } from '../analytics'; diff --git a/react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js b/react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js index f54d3f721..5abf91450 100644 --- a/react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js +++ b/react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js @@ -1,6 +1,6 @@ // @flow -import { jitsiLocalStorage } from 'js-utils'; +import { jitsiLocalStorage } from '@jitsi/js-utils'; import React, { PureComponent } from 'react'; import { diff --git a/react/features/local-recording/session/SessionManager.js b/react/features/local-recording/session/SessionManager.js index f8c13402a..794da8056 100644 --- a/react/features/local-recording/session/SessionManager.js +++ b/react/features/local-recording/session/SessionManager.js @@ -1,6 +1,6 @@ /* @flow */ -import { jitsiLocalStorage } from 'js-utils'; +import { jitsiLocalStorage } from '@jitsi/js-utils'; import logger from '../logger'; diff --git a/react/features/overlay/components/AbstractPageReloadOverlay.js b/react/features/overlay/components/AbstractPageReloadOverlay.js index 139a4900e..68384468e 100644 --- a/react/features/overlay/components/AbstractPageReloadOverlay.js +++ b/react/features/overlay/components/AbstractPageReloadOverlay.js @@ -1,6 +1,6 @@ // @flow -import { randomInt } from 'js-utils/random'; +import { randomInt } from '@jitsi/js-utils/random'; import React, { Component } from 'react'; import type { Dispatch } from 'redux'; diff --git a/react/features/recent-list/reducer.js b/react/features/recent-list/reducer.js index 3a2bb9f21..62564f11c 100644 --- a/react/features/recent-list/reducer.js +++ b/react/features/recent-list/reducer.js @@ -1,6 +1,6 @@ // @flow -import { jitsiLocalStorage } from 'js-utils'; +import { jitsiLocalStorage } from '@jitsi/js-utils'; import { APP_WILL_MOUNT } from '../base/app'; import { getURLWithoutParamsNormalized } from '../base/connection'; diff --git a/react/features/welcome/components/AbstractWelcomePage.js b/react/features/welcome/components/AbstractWelcomePage.js index 7affe0dd1..13a9cd7d4 100644 --- a/react/features/welcome/components/AbstractWelcomePage.js +++ b/react/features/welcome/components/AbstractWelcomePage.js @@ -1,6 +1,6 @@ // @flow -import { generateRoomWithoutSeparator } from 'js-utils/random'; +import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random'; import { Component } from 'react'; import type { Dispatch } from 'redux'; diff --git a/webpack.config.js b/webpack.config.js index 49719fc97..7674fdf53 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -55,7 +55,7 @@ const config = { // as well. exclude: [ - new RegExp(`${__dirname}/node_modules/(?!js-utils)`) + new RegExp(`${__dirname}/node_modules/(?!@jitsi/js-utils)`) ], loader: 'babel-loader', options: {