浏览代码

Adds strophe.js and plugin-disco as a dependency to fix build problem.

Bumps lib-jitsi-meet to latest. There was a problem that jitsi-meet build fail if anybody touches package.json (including PR testing), this happen after start using custom strophe.js from github:jitsi/strophejs.
The error:
    ERROR in ../strophejs-plugin-disco/lib/strophe.disco.js
    Module not found: Error: Can't resolve 'strophe.js' in '/Users/dminkov/dev/jitsi-meet/node_modules/strophejs-plugin-disco/lib'
     @ ../strophejs-plugin-disco/lib/strophe.disco.js 4:126-147 4:196-227
     @ ./modules/xmpp/xmpp.js
     @ ./JitsiConnection.js
     @ ./JitsiMeetJS.js
     @ ./index.js

Without strophejs-plugin-disco jitsi-meet builds but on runtime loading fail with:
Error: Missing strophe-plugins (disco plugin is required)!

FIXME: We should remove this once strophe.js releases new version and we are back to the official one inside lib-jitsi-meet.
master
damencho 7 年前
父节点
当前提交
990b1eddf2
共有 2 个文件被更改,包括 3 次插入7 次删除
  1. 1
    6
      package-lock.json
  2. 2
    1
      package.json

+ 1
- 6
package-lock.json 查看文件

7158
       }
7158
       }
7159
     },
7159
     },
7160
     "lib-jitsi-meet": {
7160
     "lib-jitsi-meet": {
7161
-      "version": "github:jitsi/lib-jitsi-meet#4ac0af12e26a3012dc59eca06eb823b1a0602826",
7161
+      "version": "github:jitsi/lib-jitsi-meet#f9644b5c7093d61690e36a008aa7fc96a793234d",
7162
       "requires": {
7162
       "requires": {
7163
         "async": "0.9.0",
7163
         "async": "0.9.0",
7164
         "current-executing-script": "0.1.3",
7164
         "current-executing-script": "0.1.3",
7171
         "strophejs-plugin-disco": "0.0.2",
7171
         "strophejs-plugin-disco": "0.0.2",
7172
         "webrtc-adapter": "github:webrtc/adapter#1eec19782b4058d186341263e7d049cea3e3290a",
7172
         "webrtc-adapter": "github:webrtc/adapter#1eec19782b4058d186341263e7d049cea3e3290a",
7173
         "yaeti": "1.0.1"
7173
         "yaeti": "1.0.1"
7174
-      },
7175
-      "dependencies": {
7176
-        "strophe.js": {
7177
-          "version": "github:jitsi/strophejs#1501521d305e405f4dea3f51a5473f504672a7b3"
7178
-        }
7179
       }
7174
       }
7180
     },
7175
     },
7181
     "load-json-file": {
7176
     "load-json-file": {

+ 2
- 1
package.json 查看文件

44
     "jquery-i18next": "1.2.0",
44
     "jquery-i18next": "1.2.0",
45
     "js-md5": "0.6.1",
45
     "js-md5": "0.6.1",
46
     "jwt-decode": "2.2.0",
46
     "jwt-decode": "2.2.0",
47
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#4ac0af12e26a3012dc59eca06eb823b1a0602826",
47
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#f9644b5c7093d61690e36a008aa7fc96a793234d ",
48
     "lodash": "4.17.4",
48
     "lodash": "4.17.4",
49
     "moment": "2.19.4",
49
     "moment": "2.19.4",
50
     "nuclear-js": "1.4.0",
50
     "nuclear-js": "1.4.0",
68
     "redux": "3.7.2",
68
     "redux": "3.7.2",
69
     "redux-thunk": "2.2.0",
69
     "redux-thunk": "2.2.0",
70
     "strophe.js": "github:jitsi/strophejs#1.2.14-1",
70
     "strophe.js": "github:jitsi/strophejs#1.2.14-1",
71
+    "strophejs-plugin-disco": "0.0.2",
71
     "styled-components": "1.3.0",
72
     "styled-components": "1.3.0",
72
     "url-polyfill": "github:github/url-polyfill#39734186de44612bc5a16eb25f5407adcc5b2e7c",
73
     "url-polyfill": "github:github/url-polyfill#39734186de44612bc5a16eb25f5407adcc5b2e7c",
73
     "uuid": "3.1.0",
74
     "uuid": "3.1.0",

正在加载...
取消
保存