Bläddra i källkod

Update Strophe.js, strophe plugins and backbone.browserStorage

JC Brand 6 år sedan
förälder
incheckning
a49c1f5592
9 ändrade filer med 726 tillägg och 899 borttagningar
  1. 1 1
      .travis.yml
  2. 322 384
      dist/converse.js
  3. 392 498
      package-lock.json
  4. 7 9
      package.json
  5. 1 1
      src/converse-core.js
  6. 1 1
      src/converse-mam.js
  7. 1 1
      src/converse-ping.js
  8. 1 1
      src/utils/core.js
  9. 0 3
      webpack.config.js

+ 1 - 1
.travis.yml

@@ -6,7 +6,7 @@ cache:
 addons:
     chrome: stable
 node_js:
- - 6
+ - "9"
 install: make stamp-npm
 before_script: make serve_bg
 script: make check

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 322 - 384
dist/converse.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 392 - 498
package-lock.json


+ 7 - 9
package.json

@@ -32,15 +32,14 @@
     "browser": "*"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0-beta.48",
-    "@babel/core": "^7.0.0-beta.48",
-    "@babel/preset-env": "^7.0.0-beta.48",
-    "@babel/preset-es2015": "^7.0.0-beta.49",
+    "@babel/cli": "^7.1.0",
+    "@babel/core": "^7.1.0",
+    "@babel/preset-env": "^7.1.0",
     "@fortawesome/fontawesome-free": "5.3.1",
     "awesomplete-avoid-xss": "^1.1.2",
-    "babel-loader": "^8.0.0-beta.3",
+    "babel-loader": "^8.0.0",
     "backbone": "1.3.3",
-    "backbone.browserStorage": "jcbrand/Backbone.browserStorage#78e4a58f7cee10cad6af4fd5f3213331a396aa5a",
+    "backbone.browserStorage": "0.0.4",
     "backbone.nativeview": "^0.3.3",
     "backbone.overview": "1.0.2",
     "backbone.vdomview": "1.0.1",
@@ -78,10 +77,9 @@
     "sinon": "^2.1.0",
     "sizzle": "^2.3.3",
     "snabbdom": "0.7.1",
-    "strophe.js": "strophe/strophejs#a2692dcfdaf7d591254ac73f3d8584992b6f8da7",
-    "strophejs-plugin-ping": "0.0.1",
+    "strophejs-plugin-ping": "0.0.3",
     "strophejs-plugin-register": "0.0.1",
-    "strophejs-plugin-rsm": "0.0.1",
+    "strophejs-plugin-rsm": "0.0.2",
     "twemoji": "^11.0.1",
     "uglify-es": "^3.0.24",
     "urijs": "^1.19.1",

+ 1 - 1
src/converse-core.js

@@ -13,7 +13,7 @@
             "i18n",
             "utils/core",
             "moment",
-            "strophe",
+            "strophe.js",
             "pluggable",
             "backbone.noconflict",
             "backbone.nativeview",

+ 1 - 1
src/converse-mam.js

@@ -12,7 +12,7 @@
     define(["sizzle",
             "converse-core",
             "converse-disco",
-            "strophe.rsm"
+            "strophejs-plugin-rsm"
     ], factory);
 }(this, function (sizzle, converse) {
     "use strict";

+ 1 - 1
src/converse-ping.js

@@ -8,7 +8,7 @@
  * as specified in XEP-0199 XMPP Ping.
  */
 (function (root, factory) {
-    define(["converse-core", "strophe.ping"], factory);
+    define(["converse-core", "strophejs-plugin-ping"], factory);
 }(this, function (converse) {
     "use strict";
     // Strophe methods for building stanzas

+ 1 - 1
src/utils/core.js

@@ -15,7 +15,7 @@
             "fast-text-encoding",
             "lodash.noconflict",
             "backbone",
-            "strophe",
+            "strophe.js",
             "uri",
             "templates/audio.html",
             "templates/file.html",

+ 0 - 3
webpack.config.js

@@ -106,9 +106,6 @@ const config = {
             "snabbdom-eventlisteners":  path.resolve(__dirname, "node_modules/snabbdom/dist/snabbdom-eventlisteners"),
             "snabbdom-props":           path.resolve(__dirname, "node_modules/snabbdom/dist/snabbdom-props"),
             "snabbdom-style":           path.resolve(__dirname, "node_modules/snabbdom/dist/snabbdom-style"),
-            "strophe":                  path.resolve(__dirname, "node_modules/strophe.js/dist/strophe"),
-            "strophe.ping":             path.resolve(__dirname, "node_modules/strophejs-plugin-ping/strophe.ping"),
-            "strophe.rsm":              path.resolve(__dirname, "node_modules/strophejs-plugin-rsm/strophe.rsm"),
             "tovnode":                  path.resolve(__dirname, "node_modules/snabbdom/dist/tovnode"),
             "underscore":               path.resolve(__dirname, "src/underscore-shim"),
             "uri":                      path.resolve(__dirname, "node_modules/urijs/src/URI"),

Vissa filer visades inte eftersom för många filer har ändrats