From b8f4da2213fab7dd5b741b5cd9e43529221fba15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 23 Feb 2021 14:22:54 +0100 Subject: [PATCH] Update dependencies --- app/features/welcome/components/Welcome.js | 2 +- package-lock.json | 32 ++++++++-------------- package.json | 4 +-- webpack.renderer.js | 4 ++- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/app/features/welcome/components/Welcome.js b/app/features/welcome/components/Welcome.js index 7a7b7a4..d5a7090 100644 --- a/app/features/welcome/components/Welcome.js +++ b/app/features/welcome/components/Welcome.js @@ -6,7 +6,7 @@ import { SpotlightTarget } from '@atlaskit/onboarding'; import Page from '@atlaskit/page'; import { AtlasKitThemeProvider } from '@atlaskit/theme'; -import { generateRoomWithoutSeparator } from 'js-utils/random'; +import { generateRoomWithoutSeparator } from '@jitsi/js-utils/random'; import React, { Component } from 'react'; import { withTranslation } from 'react-i18next'; import { compose } from 'redux'; diff --git a/package-lock.json b/package-lock.json index 3c85b05..766edb0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3594,6 +3594,15 @@ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, + "@jitsi/js-utils": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@jitsi/js-utils/-/js-utils-1.0.5.tgz", + "integrity": "sha512-1APQyuqQaYDR+W7cdgzsaBo6x8dpF8sfelcBf3ngNU3Jd+DzuuwUvCMTbr2+cCuy6w59ZAuQ7e2ixCnnOXOW4Q==", + "requires": { + "bowser": "2.7.0", + "js-md5": "0.7.3" + } + }, "@sindresorhus/is": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", @@ -10164,23 +10173,15 @@ } }, "jitsi-meet-electron-utils": { - "version": "github:jitsi/jitsi-meet-electron-utils#d606da675a3e8f2e327bcf12b15120b188002d0f", - "from": "github:jitsi/jitsi-meet-electron-utils#v2.0.12", + "version": "github:jitsi/jitsi-meet-electron-utils#314b561a095e414fe1d7687f705fce126f46b112", + "from": "github:jitsi/jitsi-meet-electron-utils#v2.0.13", "requires": { "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#v1.0.0", "mac-screen-capture-permissions": "^1.1.0", "nan": "^2.14.0", "postis": "^2.2.0", "prebuild-install": "^5.3.0", - "robotjs": "0.6.0", - "semver": "7.1.1" - }, - "dependencies": { - "semver": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz", - "integrity": "sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A==" - } + "robotjs": "0.6.0" } }, "jitsi-meet-logger": { @@ -10197,15 +10198,6 @@ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, - "js-utils": { - "version": "github:jitsi/js-utils#cf11996bd866fdb47326c59a5d3bc24be17282d4", - "from": "github:jitsi/js-utils#cf11996bd866fdb47326c59a5d3bc24be17282d4", - "requires": { - "bowser": "2.7.0", - "js-md5": "0.7.3", - "postis": "2.2.0" - } - }, "js-yaml": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", diff --git a/package.json b/package.json index 2c8e6eb..59126ee 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "@atlaskit/spinner": "9.0.13", "@atlaskit/theme": "7.0.1", "@atlaskit/toggle": "5.0.14", + "@jitsi/js-utils": "1.0.5", "electron-context-menu": "2.0.1", "electron-debug": "3.0.1", "electron-is-dev": "1.2.0", @@ -115,8 +116,7 @@ "electron-window-state": "5.0.3", "history": "4.10.1", "i18next": "19.4.5", - "jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v2.0.12", - "js-utils": "github:jitsi/js-utils#cf11996bd866fdb47326c59a5d3bc24be17282d4", + "jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v2.0.13", "moment": "2.23.0", "mousetrap": "1.6.2", "react": "16.8.0", diff --git a/webpack.renderer.js b/webpack.renderer.js index 63d42d6..aa41649 100644 --- a/webpack.renderer.js +++ b/webpack.renderer.js @@ -28,7 +28,9 @@ module.exports = { noParse: /external_api\\.js/, rules: [ { - exclude: /node_modules(?!(\/|\\)js-utils)/, + exclude: [ + new RegExp('node_modules/(?!@jitsi/js-utils)') + ], loader: 'babel-loader', options: { babelrc: false,