瀏覽代碼

Upgrade to Strophe 1.5.0 and upgrade various other dependencies

Had to add `src/strophe-shims.js` as a webpack alias to the shims.js
file in Strophe because the usage of `require` to load Node.js packags
in shims.js is causing problems with Webpack 5.

Set postcss-clean to 1.2.0 to fix the build error `node.getIterator() is
not a function`

Upgrade to latest Webpack
JC Brand 3 年之前
父節點
當前提交
1f7fe4f48e
共有 6 個文件被更改,包括 323 次插入454 次删除
  1. 285 424
      package-lock.json
  2. 4 3
      package.json
  3. 24 25
      src/headless/package-lock.json
  4. 1 1
      src/headless/package.json
  5. 6 0
      src/strophe-shims.js
  6. 3 1
      webpack/webpack.common.js

File diff suppressed because it is too large
+ 285 - 424
package-lock.json


+ 4 - 3
package.json

@@ -93,13 +93,14 @@
     "mini-css-extract-plugin": "^2.6.0",
     "mini-css-extract-plugin": "^2.6.0",
     "minimist": "^1.2.6",
     "minimist": "^1.2.6",
     "po-loader": "^0.5.0",
     "po-loader": "^0.5.0",
-    "postcss-clean": "^1.2.2",
-    "postcss-loader": "^6.1.1",
+    "postcss": "^8.4.12",
+    "postcss-clean": "1.2.0",
+    "postcss-loader": "^6.2.1",
     "prettierx": "^0.19.0",
     "prettierx": "^0.19.0",
     "sass": "^1.51.0",
     "sass": "^1.51.0",
     "sass-loader": "^12.6.0",
     "sass-loader": "^12.6.0",
     "style-loader": "^3.1.0",
     "style-loader": "^3.1.0",
-    "webpack": "^5.36.1",
+    "webpack": "^5.72.0",
     "webpack-cli": "^4.7.2",
     "webpack-cli": "^4.7.2",
     "webpack-dev-server": "^4.8.1",
     "webpack-dev-server": "^4.8.1",
     "webpack-merge": "^5.8.0"
     "webpack-merge": "^5.8.0"

+ 24 - 25
src/headless/package-lock.json

@@ -19,7 +19,7 @@
         "pluggable.js": "3.0.1",
         "pluggable.js": "3.0.1",
         "sizzle": "^2.3.5",
         "sizzle": "^2.3.5",
         "sprintf-js": "^1.1.2",
         "sprintf-js": "^1.1.2",
-        "strophe.js": "strophe/strophejs#0356a887d4caf411219e977a61c71d22f414947e",
+        "strophe.js": "1.5.0",
         "urijs": "^1.19.10"
         "urijs": "^1.19.10"
       }
       }
     },
     },
@@ -48,9 +48,9 @@
       "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
       "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
     },
     },
     "node_modules/@xmldom/xmldom": {
     "node_modules/@xmldom/xmldom": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
-      "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.2.tgz",
+      "integrity": "sha512-+R0juSseERyoPvnBQ/cZih6bpF7IpCXlWbHRoCRzYzqpz6gWHOgf8o4MOEf6KBVuOyqU+gCNLkCWVIJAro8XyQ==",
       "optional": true,
       "optional": true,
       "engines": {
       "engines": {
         "node": ">=10.0.0"
         "node": ">=10.0.0"
@@ -404,17 +404,16 @@
       "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
       "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
     },
     },
     "node_modules/strophe.js": {
     "node_modules/strophe.js": {
-      "version": "1.4.4",
-      "resolved": "git+ssh://git@github.com/strophe/strophejs.git#0356a887d4caf411219e977a61c71d22f414947e",
-      "integrity": "sha512-JVUtoFOH5TSCh5LBF+B7ntUY6EmPhzvFaH+7TAPKyuBk3JelPIXi8g3qG+MtXOSP94q0MLT5g+fdQBP2W0OmBg==",
-      "license": "MIT",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/strophe.js/-/strophe.js-1.5.0.tgz",
+      "integrity": "sha512-H5tE/tZxPR5xP3jhXyQwsjnMSwQMf7vrn9r1OkufTApyGHYe8WjzhsfxtL3AFhVu7vFjXPPZBrmUOTm1ccYgOA==",
       "dependencies": {
       "dependencies": {
         "abab": "^2.0.3",
         "abab": "^2.0.3",
         "karma-rollup-preprocessor": "^7.0.8"
         "karma-rollup-preprocessor": "^7.0.8"
       },
       },
       "optionalDependencies": {
       "optionalDependencies": {
-        "@xmldom/xmldom": "0.7.5",
-        "ws": "^7.5.1"
+        "@xmldom/xmldom": "0.8.2",
+        "ws": "^8.5.0"
       }
       }
     },
     },
     "node_modules/to-regex-range": {
     "node_modules/to-regex-range": {
@@ -439,12 +438,12 @@
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
     },
     "node_modules/ws": {
     "node_modules/ws": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
-      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
       "optional": true,
       "optional": true,
       "engines": {
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       },
       "peerDependencies": {
       "peerDependencies": {
         "bufferutil": "^4.0.1",
         "bufferutil": "^4.0.1",
@@ -486,9 +485,9 @@
       "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
       "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
     },
     },
     "@xmldom/xmldom": {
     "@xmldom/xmldom": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
-      "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.2.tgz",
+      "integrity": "sha512-+R0juSseERyoPvnBQ/cZih6bpF7IpCXlWbHRoCRzYzqpz6gWHOgf8o4MOEf6KBVuOyqU+gCNLkCWVIJAro8XyQ==",
       "optional": true
       "optional": true
     },
     },
     "abab": {
     "abab": {
@@ -757,14 +756,14 @@
       "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
       "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
     },
     },
     "strophe.js": {
     "strophe.js": {
-      "version": "git+ssh://git@github.com/strophe/strophejs.git#0356a887d4caf411219e977a61c71d22f414947e",
-      "integrity": "sha512-JVUtoFOH5TSCh5LBF+B7ntUY6EmPhzvFaH+7TAPKyuBk3JelPIXi8g3qG+MtXOSP94q0MLT5g+fdQBP2W0OmBg==",
-      "from": "strophe.js@strophe/strophejs#0356a887d4caf411219e977a61c71d22f414947e",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/strophe.js/-/strophe.js-1.5.0.tgz",
+      "integrity": "sha512-H5tE/tZxPR5xP3jhXyQwsjnMSwQMf7vrn9r1OkufTApyGHYe8WjzhsfxtL3AFhVu7vFjXPPZBrmUOTm1ccYgOA==",
       "requires": {
       "requires": {
-        "@xmldom/xmldom": "0.7.5",
+        "@xmldom/xmldom": "0.8.2",
         "abab": "^2.0.3",
         "abab": "^2.0.3",
         "karma-rollup-preprocessor": "^7.0.8",
         "karma-rollup-preprocessor": "^7.0.8",
-        "ws": "^7.5.1"
+        "ws": "^8.5.0"
       }
       }
     },
     },
     "to-regex-range": {
     "to-regex-range": {
@@ -786,9 +785,9 @@
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
       "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ=="
     },
     },
     "ws": {
     "ws": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
-      "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+      "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
       "optional": true,
       "optional": true,
       "requires": {}
       "requires": {}
     }
     }

+ 1 - 1
src/headless/package.json

@@ -39,7 +39,7 @@
     "pluggable.js": "3.0.1",
     "pluggable.js": "3.0.1",
     "sizzle": "^2.3.5",
     "sizzle": "^2.3.5",
     "sprintf-js": "^1.1.2",
     "sprintf-js": "^1.1.2",
-    "strophe.js": "strophe/strophejs#0356a887d4caf411219e977a61c71d22f414947e",
+    "strophe.js": "1.5.0",
     "urijs": "^1.19.10"
     "urijs": "^1.19.10"
   }
   }
 }
 }

+ 6 - 0
src/strophe-shims.js

@@ -0,0 +1,6 @@
+export const WebSocket = window.WebSocket;
+export const DOMParser = window.DOMParser;
+
+export function getDummyXMLDOMDocument () {
+    return document.implementation.createDocument('jabber:client', 'strophe', null);
+}

+ 3 - 1
webpack/webpack.common.js

@@ -114,7 +114,9 @@ module.exports = {
             "IPv6":                     path.resolve(__dirname, "../node_modules/urijs/src/IPv6"),
             "IPv6":                     path.resolve(__dirname, "../node_modules/urijs/src/IPv6"),
             "SecondLevelDomains":       path.resolve(__dirname, "../node_modules/urijs/src/SecondLevelDomains"),
             "SecondLevelDomains":       path.resolve(__dirname, "../node_modules/urijs/src/SecondLevelDomains"),
             "formdata-polyfill":        path.resolve(__dirname, "../node_modules/formdata-polyfill/FormData"),
             "formdata-polyfill":        path.resolve(__dirname, "../node_modules/formdata-polyfill/FormData"),
-            "punycode":                 path.resolve(__dirname, "../node_modules/urijs/src/punycode")
+            "punycode":                 path.resolve(__dirname, "../node_modules/urijs/src/punycode"),
+            "./shims":               path.resolve(__dirname, "../src/strophe-shims.js"),
         }
         }
     }
     }
+
 }
 }

Some files were not shown because too many files changed in this diff