Merge pull request #875 from vcync/next

Merge next into main

Author: 2xAA

package.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "@electron/remote": "^2.0.4",
     "animated-gif-detector": "^1.2.0",
-    "animejs": "3.2.0",
+    "animejs": "3.2.1",
     "canvas-text-wrapper": "github:cyberj/canvas-text-wrapper#master",
     "color": "^3.1.2",
     "dotenv": "^8.2.0",
@@ -64,22 +64,23 @@
     "vuex": "^3.6.2",
     "vuex-persistedstate": "^4.0.0-beta.3",
     "webpack": "^4.43.0",
-    "webpack-2": "npm:webpack@2.7.0"
+    "webpack-3": "npm:webpack@3.12.0"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0-0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
     "@babel/plugin-proposal-optional-chaining": "^7.16.0",
     "@playwright/test": "^1.31.2",
     "@semantic-release/git": "^9.0.0",
-    "@vue/cli-plugin-babel": "^4.5.15",
+    "@vue/cli-plugin-babel": "^5.0.8",
     "@vue/cli-plugin-eslint": "^3.12.1",
-    "@vue/cli-service": "^3.12.1",
+    "@vue/cli-service": "^5.0.8",
     "@vue/eslint-config-prettier": "^4.0.1",
     "@vue/runtime-dom": "^3.2.47",
     "babel-eslint": "^10.0.3",
+    "babel-loader": "^9.1.2",
     "core-js": "^3.19.1",
-    "electron": "^23.1.2",
+    "electron": "25.1.1",
     "electron-builder": "^22.9.1",
     "electron-notarize": "^1.2.2",
     "electron-playwright-helpers": "^1.5.3",
@@ -92,11 +93,10 @@
     "playwright-core": "^1.31.2",
     "sass-loader": "^7.3.1",
     "text-loader": "0.0.1",
-    "vue-cli-plugin-electron-builder": "^2.0.0",
+    "vue-cli-plugin-electron-builder": "3.0.0-alpha.4",
     "vue-template-babel-compiler": "^2.0.0",
     "vue-template-compiler": "^2.7.14",
-    "vuex-localstorage": "^1.0.0",
-    "worker-loader": "^2.0.0"
+    "vuex-localstorage": "^1.0.0"
   },
   "gitHooks": {
     "pre-commit": "lint-staged"

src/application/index.js

@@ -4,7 +4,6 @@ import { ipcRenderer } from "electron";
 import { app } from "@electron/remote";
 import { createWebcodecVideo } from "./createWebcodecVideo";
 
-import Worker from "worker-loader!./worker/index.worker.js";
 import {
   setupMedia,
   enumerateDevices,
@@ -21,7 +20,7 @@ import { GROUP_ENABLED } from "./constants";
 let imageBitmap;
 const imageBitmapQueue = [];
 
-export default class ModV {
+class ModV {
   _mediaStream;
   _imageCapture;
   setupMedia = setupMedia;
@@ -58,7 +57,9 @@ export default class ModV {
     this.ready = new Promise(resolve => {
       resolver = resolve;
     });
-    this.$worker = new Worker();
+    this.$worker = new Worker(
+      new URL("./worker/index.worker.js", import.meta.url)
+    );
     this.$asyncWorker = new PromiseWorker(this.$worker);
 
     this.$worker.postMessage({
@@ -277,7 +278,7 @@ export default class ModV {
       meyda: { features: featuresToGet }
     } = this.store.state;
 
-    const features = this.meyda.get(featuresToGet);
+    const features = this.meyda?.get(featuresToGet);
 
     if (features) {
       this.updateBeatDetektor(delta, features);
@@ -329,3 +330,5 @@ export default class ModV {
     this.store.commit("fonts/SET_LOCAL_FONTS", fonts);
   }
 }
+
+export default new ModV();