Browse Source

merge from upstream

nb-branded v2.0.0
Christian Tramnitz 2 years ago
parent
commit
31cbc00339
  1. 21
      .travis.yml
  2. 42
      package-lock.json

21
.travis.yml

@ -6,25 +6,24 @@ matrix:
node_js: '12'
- os: linux
dist: bionic
sudo: true
language: node_js
node_js: '12'
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libx11-dev
- zlib1g-dev
- libpng12-dev
- libpng-dev
- libxtst-dev
- g++-4.8
- gcc-4.8
cache:
directories:
- node_modules
- $HOME/.cache/electron
- $HOME/.cache/electron-builder
before_script:
- | # Fix chrome-sandbox: https://github.com/electron/electron/issues/17972
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
echo "Fixing chrome-sandbox permissions..."
sudo chown root ./node_modules/electron/dist/chrome-sandbox
sudo chmod 4755 ./node_modules/electron/dist/chrome-sandbox
fi
script:
- npm run dist

42
package-lock.json generated

@ -1,6 +1,6 @@
{
"name": "jitsi-meet-electron",
"version": "2.0.0-beta2",
"version": "2.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -3990,13 +3990,24 @@
}
},
"bl": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/bl/-/bl-4.0.1.tgz",
"integrity": "sha512-FL/TdvchukRCuWVxT0YMO/7+L5TNeNrVFvRU2IY63aUyv9mpt8splf2NEr6qXtPo5fya5a66YohQKvGNmLrWNA==",
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
"integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
"requires": {
"buffer": "^5.5.0",
"inherits": "^2.0.4",
"readable-stream": "^3.4.0"
},
"dependencies": {
"buffer": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz",
"integrity": "sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==",
"requires": {
"base64-js": "^1.0.2",
"ieee754": "^1.1.4"
}
},
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@ -8111,8 +8122,8 @@
}
},
"jitsi-meet-electron-utils": {
"version": "github:jitsi/jitsi-meet-electron-utils#83fd972296a9a6005762c0627f80c3f44ad6b832",
"from": "github:jitsi/jitsi-meet-electron-utils#v2.0.1",
"version": "github:jitsi/jitsi-meet-electron-utils#364d6ad20b2f1b81614444eab0d9f4166b8aead4",
"from": "github:jitsi/jitsi-meet-electron-utils#v2.0.3",
"requires": {
"nan": "^2.14.0",
"postis": "^2.2.0",
@ -8814,6 +8825,11 @@
"minimist": "0.0.8"
}
},
"mkdirp-classic": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz",
"integrity": "sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
},
"moment": {
"version": "2.23.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.23.0.tgz",
@ -9659,9 +9675,9 @@
},
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
}
}
},
@ -11325,12 +11341,12 @@
"dev": true
},
"tar-fs": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz",
"integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz",
"integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==",
"requires": {
"chownr": "^1.1.1",
"mkdirp": "^0.5.1",
"mkdirp-classic": "^0.5.2",
"pump": "^3.0.0",
"tar-stream": "^2.0.0"
}

Loading…
Cancel
Save