Browse Source

Run `npm update` and fix resulting dynamic import error.

For some reason the newer webpack versions can't handle the destructured
assignment from a dynamic import of a JSON file.
JC Brand 1 year ago
parent
commit
1e4937bf41
4 changed files with 187 additions and 716 deletions
  1. 182 712
      package-lock.json
  2. 1 1
      package.json
  3. 2 2
      src/headless/plugins/emoji/index.js
  4. 2 1
      tsconfig.json

File diff suppressed because it is too large
+ 182 - 712
package-lock.json


+ 1 - 1
package.json

@@ -104,7 +104,7 @@
     "typescript": "^4.9.5",
     "typescript": "^4.9.5",
     "typescript-eslint-parser": "^22.0.0",
     "typescript-eslint-parser": "^22.0.0",
     "uglify-js": "^3.17.4",
     "uglify-js": "^3.17.4",
-    "webpack": "^5.72.0",
+    "webpack": "^5.86.0",
     "webpack-cli": "^5.1.4",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.8.1",
     "webpack-dev-server": "^4.8.1",
     "webpack-merge": "^5.8.0"
     "webpack-merge": "^5.8.0"

+ 2 - 2
src/headless/plugins/emoji/index.js

@@ -86,8 +86,8 @@ converse.plugins.add('converse-emoji', {
                 async initialize () {
                 async initialize () {
                     if (!converse.emojis.initialized) {
                     if (!converse.emojis.initialized) {
                         converse.emojis.initialized = true;
                         converse.emojis.initialized = true;
-                        const { default: json } = await import(/*webpackChunkName: "emojis" */ './emoji.json');
-                        converse.emojis.json = json;
+                        const module = await import(/*webpackChunkName: "emojis" */ './emoji.json');
+                        const json = converse.emojis.json = module.default;
                         converse.emojis.by_sn = Object.keys(json).reduce((result, cat) => Object.assign(result, json[cat]), {});
                         converse.emojis.by_sn = Object.keys(json).reduce((result, cat) => Object.assign(result, json[cat]), {});
                         converse.emojis.list = Object.values(converse.emojis.by_sn);
                         converse.emojis.list = Object.values(converse.emojis.by_sn);
                         converse.emojis.list.sort((a, b) => a.sn < b.sn ? -1 : (a.sn > b.sn ? 1 : 0));
                         converse.emojis.list.sort((a, b) => a.sn < b.sn ? -1 : (a.sn > b.sn ? 1 : 0));

+ 2 - 1
tsconfig.json

@@ -26,6 +26,7 @@
 
 
     "skipLibCheck": true,
     "skipLibCheck": true,
 
 
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "resolveJsonModule": true
   }
   }
 }
 }

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