From 34f8932565b2e5575f1c0f31f4338b02451ba79f Mon Sep 17 00:00:00 2001 From: Mikunj Date: Mon, 14 Oct 2019 11:43:50 +1100 Subject: [PATCH] Fix path normalisation. Added upath. Updated fs-extra. --- package-lock.json | 68 +++++++++++++++++--- package.json | 3 +- src-electron/main-process/modules/backend.js | 2 +- src-electron/main-process/modules/daemon.js | 2 +- 4 files changed, 64 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c092f9..725d1df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5747,6 +5747,17 @@ "ms": "^2.1.1" } }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -5835,6 +5846,17 @@ "ms": "^2.1.1" } }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -7093,13 +7115,20 @@ } }, "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "requires": { - "graceful-fs": "^4.1.2", + "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", "universalify": "^0.1.0" + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==" + } } }, "fs-extra-p": { @@ -7110,6 +7139,19 @@ "requires": { "bluebird-lst": "^1.0.7", "fs-extra": "^7.0.1" + }, + "dependencies": { + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } } }, "fs-write-stream-atomic": { @@ -11979,6 +12021,17 @@ "which": "^1.2.9" } }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, "inquirer": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz", @@ -14405,10 +14458,9 @@ "dev": true }, "upath": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", - "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", - "dev": true + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, "update-notifier": { "version": "2.5.0", diff --git a/package.json b/package.json index 74cf93f..f2633c2 100644 --- a/package.json +++ b/package.json @@ -18,13 +18,14 @@ "electron-is-dev": "^1.0.1", "electron-window-state": "^5.0.3", "flag-icon-css": "^3.3.0", - "fs-extra": "^7.0.1", + "fs-extra": "^8.1.0", "object-assign-deep": "^0.4.0", "portscanner": "^2.2.0", "promise-queue": "^2.2.5", "qrcode.vue": "^1.6.1", "request": "^2.88.0", "request-promise": "^4.2.4", + "upath": "^1.2.0", "vue-i18n": "^8.9.0", "vue-timeago": "^5.1.2", "vuelidate": "^0.7.4" diff --git a/src-electron/main-process/modules/backend.js b/src-electron/main-process/modules/backend.js index 9c63648..97752c5 100644 --- a/src-electron/main-process/modules/backend.js +++ b/src-electron/main-process/modules/backend.js @@ -6,7 +6,7 @@ import { dialog } from "electron" const WebSocket = require("ws") const os = require("os") const fs = require("fs-extra") -const path = require("path") +const path = require("upath") const objectAssignDeep = require("object-assign-deep") export class Backend { diff --git a/src-electron/main-process/modules/daemon.js b/src-electron/main-process/modules/daemon.js index 126203d..e54cb92 100644 --- a/src-electron/main-process/modules/daemon.js +++ b/src-electron/main-process/modules/daemon.js @@ -3,7 +3,7 @@ const request = require("request-promise") const queue = require("promise-queue") const http = require("http") const fs = require("fs") -const path = require("path") +const path = require("upath") const portscanner = require("portscanner") export class Daemon {