valerie
/
viscord
Archived
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

second pass, really...

cordova
Valerie 2022-07-20 16:40:43 -04:00
parent e651446cc2
commit 321c6c5c01
5 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
package-lock.json generated
View File

@ -16,6 +16,7 @@
"electron-updater": "5.0.5",
"eslint-plugin-react": "^7.30.1",
"express": "^4.18.1",
"get-port": "^6.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-time-ago": "^7.2.1",
@ -4397,12 +4398,14 @@
}
},
"node_modules/get-port": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
"integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
"dev": true,
"version": "6.1.2",
"resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz",
"integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==",
"engines": {
"node": ">=4"
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/get-stream": {
@ -7110,6 +7113,15 @@
"get-port": "^3.1.0"
}
},
"node_modules/sync-rpc/node_modules/get-port": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
"integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
"dev": true,
"engines": {
"node": ">=4"
}
},
"node_modules/tar": {
"version": "6.1.11",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
@ -11364,10 +11376,9 @@
}
},
"get-port": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
"integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
"dev": true
"version": "6.1.2",
"resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz",
"integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw=="
},
"get-stream": {
"version": "4.1.0",
@ -13367,6 +13378,14 @@
"dev": true,
"requires": {
"get-port": "^3.1.0"
},
"dependencies": {
"get-port": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
"integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
"dev": true
}
}
},
"tar": {

1
package.json
View File

@ -64,6 +64,7 @@
"electron-updater": "5.0.5",
"eslint-plugin-react": "^7.30.1",
"express": "^4.18.1",
"get-port": "^6.1.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-time-ago": "^7.2.1",

3
packages/renderer/.eslintrc.json
View File

@ -12,5 +12,6 @@
"parser": "@typescript-eslint/parser",
"ecmaVersion": 12,
"sourceType": "module"
}
},
"no-unused-vars": "off"
}

1
packages/renderer/tsconfig.json
View File

@ -1,6 +1,5 @@
{
"compilerOptions": {
"impl"
"module": "esnext",
"target": "esnext",
"sourceMap": false,

6
scripts/watch.js
View File

@ -5,6 +5,8 @@ const electronPath = require('electron');
const {spawn} = require('child_process');
const node = 'node' + (process.platform === 'win32' ? '.exe' : '');
const server = !process.argv.includes('--noserver');
/** @type 'production' | 'development'' */
const mode = process.env.MODE = process.env.MODE || 'development';
@ -45,14 +47,12 @@ const setupServerPackageWatcher = () => {
plugins: [{
name: 'reload-server-on-server-package-change',
writeBundle() {
/** Kill electron ff process already exist */
if (spawnProcess !== null) {
spawnProcess.off('exit', processDied);
spawnProcess.kill('SIGINT');
spawnProcess = null;
}
/** Spawn new electron process */
spawnProcess = spawn(node, ['./index.cjs'], {
cwd: './packages/server/dist',
});
@ -195,7 +195,7 @@ const setupPreloadPackageWatcher = ({ws}) =>
* See {@link setupMainPackageWatcher} JSDoc
*/
await setupMainPackageWatcher(rendererWatchServer);
await setupServerPackageWatcher();
if(server) await setupServerPackageWatcher();
} catch (e) {
console.error(e);
process.exit(1);