Skip to content

Commit 41ee97a

Browse files
authored
build: update packages & node 18 support (#862)
* build: update packages * build: support node 18 * build: drop worker-loader
1 parent 09c28fd commit 41ee97a

8 files changed

Lines changed: 4593 additions & 5338 deletions

File tree

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"dependencies": {
2828
"@electron/remote": "^2.0.4",
2929
"animated-gif-detector": "^1.2.0",
30-
"animejs": "3.2.0",
30+
"animejs": "3.2.1",
3131
"canvas-text-wrapper": "github:cyberj/canvas-text-wrapper#master",
3232
"color": "^3.1.2",
3333
"dotenv": "^8.2.0",
@@ -64,22 +64,23 @@
6464
"vuex": "^3.6.2",
6565
"vuex-persistedstate": "^4.0.0-beta.3",
6666
"webpack": "^4.43.0",
67-
"webpack-2": "npm:webpack@2.7.0"
67+
"webpack-3": "npm:webpack@3.12.0"
6868
},
6969
"devDependencies": {
7070
"@babel/core": "^7.0.0-0",
7171
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
7272
"@babel/plugin-proposal-optional-chaining": "^7.16.0",
7373
"@playwright/test": "^1.31.2",
7474
"@semantic-release/git": "^9.0.0",
75-
"@vue/cli-plugin-babel": "^4.5.15",
75+
"@vue/cli-plugin-babel": "^5.0.8",
7676
"@vue/cli-plugin-eslint": "^3.12.1",
77-
"@vue/cli-service": "^3.12.1",
77+
"@vue/cli-service": "^5.0.8",
7878
"@vue/eslint-config-prettier": "^4.0.1",
7979
"@vue/runtime-dom": "^3.2.47",
8080
"babel-eslint": "^10.0.3",
81+
"babel-loader": "^9.1.2",
8182
"core-js": "^3.19.1",
82-
"electron": "^23.1.2",
83+
"electron": "25.1.1",
8384
"electron-builder": "^22.9.1",
8485
"electron-notarize": "^1.2.2",
8586
"electron-playwright-helpers": "^1.5.3",
@@ -92,11 +93,10 @@
9293
"playwright-core": "^1.31.2",
9394
"sass-loader": "^7.3.1",
9495
"text-loader": "0.0.1",
95-
"vue-cli-plugin-electron-builder": "^2.0.0",
96+
"vue-cli-plugin-electron-builder": "3.0.0-alpha.4",
9697
"vue-template-babel-compiler": "^2.0.0",
9798
"vue-template-compiler": "^2.7.14",
98-
"vuex-localstorage": "^1.0.0",
99-
"worker-loader": "^2.0.0"
99+
"vuex-localstorage": "^1.0.0"
100100
},
101101
"gitHooks": {
102102
"pre-commit": "lint-staged"

src/application/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { ipcRenderer } from "electron";
44
import { app } from "@electron/remote";
55
import { createWebcodecVideo } from "./createWebcodecVideo";
66

7-
import Worker from "worker-loader!./worker/index.worker.js";
87
import {
98
setupMedia,
109
enumerateDevices,
@@ -58,7 +57,9 @@ class ModV {
5857
this.ready = new Promise(resolve => {
5958
resolver = resolve;
6059
});
61-
this.$worker = new Worker();
60+
this.$worker = new Worker(
61+
new URL("./worker/index.worker.js", import.meta.url)
62+
);
6263
this.$asyncWorker = new PromiseWorker(this.$worker);
6364

6465
this.$worker.postMessage({
@@ -277,7 +278,7 @@ class ModV {
277278
meyda: { features: featuresToGet }
278279
} = this.store.state;
279280

280-
const features = this.meyda.get(featuresToGet);
281+
const features = this.meyda?.get(featuresToGet);
281282

282283
if (features) {
283284
this.updateBeatDetektor(delta, features);

src/application/sample-modules/Line.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,14 @@ export default {
5959
},
6060

6161
data: {
62-
vector: [[0, 0], [0, 0]],
63-
velocity: [[1, 1], [1, 1]],
62+
vector: [
63+
[0, 0],
64+
[0, 0]
65+
],
66+
velocity: [
67+
[1, 1],
68+
[1, 1]
69+
],
6470
history: []
6571
},
6672

src/application/worker/loop.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ function loop(delta, features, fftOutput) {
202202
const module = active[group.modules[j]];
203203

204204
if (
205+
!module ||
205206
!module.meta.enabled ||
206207
module.meta.alpha < 0.001 ||
207208
module.$status.length

src/media-manager/read-handlers/isf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const fs = require("fs");
22
const path = require("path");
33
const util = require("util");
4-
const webpack = require("webpack-2");
4+
const webpack = require("webpack-3");
55

66
const readFile = util.promisify(fs.readFile);
77
const writeFile = util.promisify(fs.writeFile);

src/media-manager/read-handlers/module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const recursiveDeps = require("recursive-deps");
2-
const webpack = require("webpack-2");
2+
const webpack = require("webpack-3");
33
const path = require("path");
44
const npm = require("npm");
55
const fs = require("fs");

vue.config.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ module.exports = {
3636
]
3737
},
3838

39-
serve: {
40-
hot: true,
41-
// hotOnly: true,
42-
contentBase: "./"
39+
devServer: {
40+
hot: true
4341
},
4442

4543
node: {
@@ -68,7 +66,7 @@ module.exports = {
6866
"stream-to-blob",
6967
"grandiose",
7068
"npm",
71-
"webpack-2",
69+
"webpack-3",
7270
"font-list"
7371
],
7472

0 commit comments

Comments
 (0)