Downgrade jsondiffpatch because ESM is just a bunch of elitist busywork. Fix output paths for electron-forge.

This commit is contained in:
sayhiben
2024-08-22 20:09:38 -07:00
parent d536ebff8e
commit a2ec543e68
4 changed files with 51 additions and 26 deletions

67
package-lock.json generated
View File

@@ -22,7 +22,7 @@
"electron": "^32.0.0", "electron": "^32.0.0",
"electron-squirrel-startup": "^1.0.1", "electron-squirrel-startup": "^1.0.1",
"hls.js": "^1.5.14", "hls.js": "^1.5.14",
"jsondiffpatch": "^0.6.0", "jsondiffpatch": "^0.5.0",
"koa": "^2.15.3", "koa": "^2.15.3",
"koa-basic-auth": "^4.0.0", "koa-basic-auth": "^4.0.0",
"koa-easy-ws": "^2.1.0", "koa-easy-ws": "^2.1.0",
@@ -6173,11 +6173,6 @@
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz", "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz",
"integrity": "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==" "integrity": "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="
}, },
"node_modules/@types/diff-match-patch": {
"version": "1.0.36",
"resolved": "https://registry.npmjs.org/@types/diff-match-patch/-/diff-match-patch-1.0.36.tgz",
"integrity": "sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg=="
},
"node_modules/@types/duplexify": { "node_modules/@types/duplexify": {
"version": "3.6.0", "version": "3.6.0",
"resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.0.tgz", "resolved": "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.0.tgz",
@@ -14143,32 +14138,62 @@
} }
}, },
"node_modules/jsondiffpatch": { "node_modules/jsondiffpatch": {
"version": "0.6.0", "version": "0.5.0",
"resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.6.0.tgz", "resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.5.0.tgz",
"integrity": "sha512-3QItJOXp2AP1uv7waBkao5nCvhEv+QmJAd38Ybq7wNI74Q+BBmnLn4EDKz6yI9xGAIQoUF87qHt+kc1IVxB4zQ==", "integrity": "sha512-Quz3MvAwHxVYNXsOByL7xI5EB2WYOeFswqaHIA3qOK3isRWTxiplBEocmmru6XmxDB2L7jDNYtYA4FyimoAFEw==",
"dependencies": { "dependencies": {
"@types/diff-match-patch": "^1.0.36", "chalk": "^3.0.0",
"chalk": "^5.3.0", "diff-match-patch": "^1.0.0"
"diff-match-patch": "^1.0.5"
}, },
"bin": { "bin": {
"jsondiffpatch": "bin/jsondiffpatch.js" "jsondiffpatch": "bin/jsondiffpatch"
}, },
"engines": { "engines": {
"node": "^18.0.0 || >=20.0.0" "node": ">=8.17.0"
}
},
"node_modules/jsondiffpatch/node_modules/ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dependencies": {
"color-convert": "^2.0.1"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
} }
}, },
"node_modules/jsondiffpatch/node_modules/chalk": { "node_modules/jsondiffpatch/node_modules/chalk": {
"version": "5.3.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"engines": { "dependencies": {
"node": "^12.17.0 || ^14.13 || >=16.0.0" "ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}, },
"funding": { "engines": {
"url": "https://github.com/chalk/chalk?sponsor=1" "node": ">=8"
} }
}, },
"node_modules/jsondiffpatch/node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dependencies": {
"color-name": "~1.1.4"
},
"engines": {
"node": ">=7.0.0"
}
},
"node_modules/jsondiffpatch/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/jsonfile": { "node_modules/jsonfile": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",

View File

@@ -27,7 +27,7 @@
"electron": "^32.0.0", "electron": "^32.0.0",
"electron-squirrel-startup": "^1.0.1", "electron-squirrel-startup": "^1.0.1",
"hls.js": "^1.5.14", "hls.js": "^1.5.14",
"jsondiffpatch": "^0.6.0", "jsondiffpatch": "^0.5.0",
"koa": "^2.15.3", "koa": "^2.15.3",
"koa-basic-auth": "^4.0.0", "koa-basic-auth": "^4.0.0",
"koa-easy-ws": "^2.1.0", "koa-easy-ws": "^2.1.0",

View File

@@ -17,7 +17,7 @@ module.exports = {
}), }),
entry: './src/node/main.js', entry: './src/node/main.js',
output: { output: {
path: path.resolve(__dirname, 'dist/main'), path: path.resolve(__dirname, '.webpack/main'),
filename: 'main.js' filename: 'index.js'
} },
} }

View File

@@ -18,7 +18,7 @@ module.exports = {
playHLS: './src/renderer/playHLS.js' playHLS: './src/renderer/playHLS.js'
}, },
output: { output: {
path: path.resolve(__dirname, 'dist/renderer'), path: path.resolve(__dirname, '.webpack/renderer'),
filename: '[name].js' filename: '[name].js'
} }
} }