selfhosted
/
padloc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some dependency upgrades

This commit is contained in:
Martin Kleinschrodt 2021-09-15 10:19:15 +02:00
parent 6f1a144b16
commit 54a161e502
15 changed files with 23837 additions and 21514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
package-lock.json generated
View File

@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
"name": "padloc",
"version": "3.1.1",
"hasInstallScript": true,
"license": "GPL-3.0",
@ -4925,18 +4926,18 @@
}
},
"node_modules/node-gyp/node_modules/tar": {
"version": "4.4.15",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.15.tgz",
"integrity": "sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA==",
"version": "4.4.19",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
"integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
"dev": true,
"dependencies": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
"minipass": "^2.8.6",
"minizlib": "^1.2.1",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2",
"yallist": "^3.0.3"
"chownr": "^1.1.4",
"fs-minipass": "^1.2.7",
"minipass": "^2.9.0",
"minizlib": "^1.3.3",
"mkdirp": "^0.5.5",
"safe-buffer": "^5.2.1",
"yallist": "^3.1.1"
},
"engines": {
"node": ">=4.5"
@ -6753,9 +6754,9 @@
}
},
"node_modules/tar": {
"version": "6.1.6",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz",
"integrity": "sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==",
"version": "6.1.11",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
"integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
"dev": true,
"dependencies": {
"chownr": "^2.0.0",
@ -11707,18 +11708,18 @@
"dev": true
},
"tar": {
"version": "4.4.15",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.15.tgz",
"integrity": "sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA==",
"version": "4.4.19",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
"integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
"dev": true,
"requires": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
"minipass": "^2.8.6",
"minizlib": "^1.2.1",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2",
"yallist": "^3.0.3"
"chownr": "^1.1.4",
"fs-minipass": "^1.2.7",
"minipass": "^2.9.0",
"minizlib": "^1.3.3",
"mkdirp": "^0.5.5",
"safe-buffer": "^5.2.1",
"yallist": "^3.1.1"
}
},
"which": {
@ -13091,9 +13092,9 @@
}
},
"tar": {
"version": "6.1.6",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz",
"integrity": "sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==",
"version": "6.1.11",
"resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
"integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
"dev": true,
"requires": {
"chownr": "^2.0.0",

102
packages/electron/package-lock.json generated
View File

@ -15,15 +15,15 @@
"devDependencies": {
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^5.2.6",
"electron": "^13.0.1",
"electron-builder": "^22.10.5",
"electron-notarize": "^1.0.0",
"electron": "^14.0.1",
"electron-builder": "^22.11.7",
"electron-notarize": "^1.1.1",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.3.1",
"html-webpack-plugin": "^5.3.2",
"style-loader": "^2.0.0",
"ts-loader": "^9.2.2",
"webpack": "^5.38.1",
"webpack-cli": "^4.7.0"
"ts-loader": "^9.2.5",
"webpack": "^5.52.1",
"webpack-cli": "^4.8.0"
}
},
"node_modules/@develar/schema-utils": {
@ -358,9 +358,9 @@
"optional": true
},
"node_modules/@types/webpack": {
"version": "4.41.30",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.30.tgz",
"integrity": "sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==",
"version": "4.41.31",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
"integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
"dev": true,
"dependencies": {
"@types/node": "*",
@ -372,9 +372,9 @@
}
},
"node_modules/@types/webpack-sources": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.1.tgz",
"integrity": "sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ==",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
"integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
"dev": true,
"dependencies": {
"@types/node": "*",
@ -575,9 +575,9 @@
}
},
"node_modules/@webpack-cli/serve": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz",
"integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==",
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
"integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
"dev": true,
"peerDependencies": {
"webpack-cli": "4.x.x"
@ -2098,9 +2098,9 @@
}
},
"node_modules/electron": {
"version": "13.1.8",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.1.8.tgz",
"integrity": "sha512-ei2ZyyG81zUOlvm5Zxri668TdH5GNLY0wF+XrC2FRCqa8AABAPjJIWTRkhFEr/H6PDVPNZjMPvSs3XhHyVVk2g==",
"version": "14.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-14.0.1.tgz",
"integrity": "sha512-1XILvfE5mQEBz5L/QeNfcwC3PxAIjwMyA3GR8Naw5C0IKAnHl3lAdjczbtGX8nqbcEpOAVo+4TMSpcPD3zxe8Q==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@ -2178,9 +2178,9 @@
}
},
"node_modules/electron-notarize": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.1.tgz",
"integrity": "sha512-5B0ToIuuqb+Uzq3Kvs7BReUh52WRELmy8dHWusQwXgksYm2RgzsFFGNhv9eAmzuzXNW4xPgUbdCmYrcVGSlXIg==",
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz",
"integrity": "sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw==",
"dev": true,
"dependencies": {
"debug": "^4.1.1",
@ -5365,9 +5365,9 @@
}
},
"node_modules/webpack": {
"version": "5.49.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz",
"integrity": "sha512-XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==",
"version": "5.52.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.52.1.tgz",
"integrity": "sha512-wkGb0hLfrS7ML3n2xIKfUIwHbjB6gxwQHyLmVHoAqEQBw+nWo+G6LoHL098FEXqahqximsntjBLuewStrnJk0g==",
"dev": true,
"dependencies": {
"@types/eslint-scope": "^3.7.0",
@ -5412,15 +5412,15 @@
}
},
"node_modules/webpack-cli": {
"version": "4.7.2",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz",
"integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==",
"version": "4.8.0",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz",
"integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==",
"dev": true,
"dependencies": {
"@discoveryjs/json-ext": "^0.5.0",
"@webpack-cli/configtest": "^1.0.4",
"@webpack-cli/info": "^1.3.0",
"@webpack-cli/serve": "^1.5.1",
"@webpack-cli/serve": "^1.5.2",
"colorette": "^1.2.1",
"commander": "^7.0.0",
"execa": "^5.0.0",
@ -6077,9 +6077,9 @@
"optional": true
},
"@types/webpack": {
"version": "4.41.30",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.30.tgz",
"integrity": "sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==",
"version": "4.41.31",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
"integrity": "sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==",
"dev": true,
"requires": {
"@types/node": "*",
@ -6091,9 +6091,9 @@
}
},
"@types/webpack-sources": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.1.tgz",
"integrity": "sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ==",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
"integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
"dev": true,
"requires": {
"@types/node": "*",
@ -6287,9 +6287,9 @@
}
},
"@webpack-cli/serve": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz",
"integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==",
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz",
"integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==",
"dev": true,
"requires": {}
},
@ -7441,9 +7441,9 @@
}
},
"electron": {
"version": "13.1.8",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.1.8.tgz",
"integrity": "sha512-ei2ZyyG81zUOlvm5Zxri668TdH5GNLY0wF+XrC2FRCqa8AABAPjJIWTRkhFEr/H6PDVPNZjMPvSs3XhHyVVk2g==",
"version": "14.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-14.0.1.tgz",
"integrity": "sha512-1XILvfE5mQEBz5L/QeNfcwC3PxAIjwMyA3GR8Naw5C0IKAnHl3lAdjczbtGX8nqbcEpOAVo+4TMSpcPD3zxe8Q==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
@ -7509,9 +7509,9 @@
}
},
"electron-notarize": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.0.1.tgz",
"integrity": "sha512-5B0ToIuuqb+Uzq3Kvs7BReUh52WRELmy8dHWusQwXgksYm2RgzsFFGNhv9eAmzuzXNW4xPgUbdCmYrcVGSlXIg==",
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz",
"integrity": "sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw==",
"dev": true,
"requires": {
"debug": "^4.1.1",
@ -9952,9 +9952,9 @@
}
},
"webpack": {
"version": "5.49.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz",
"integrity": "sha512-XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==",
"version": "5.52.1",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.52.1.tgz",
"integrity": "sha512-wkGb0hLfrS7ML3n2xIKfUIwHbjB6gxwQHyLmVHoAqEQBw+nWo+G6LoHL098FEXqahqximsntjBLuewStrnJk0g==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
@ -9984,15 +9984,15 @@
}
},
"webpack-cli": {
"version": "4.7.2",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz",
"integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==",
"version": "4.8.0",
"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz",
"integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==",
"dev": true,
"requires": {
"@discoveryjs/json-ext": "^0.5.0",
"@webpack-cli/configtest": "^1.0.4",
"@webpack-cli/info": "^1.3.0",
"@webpack-cli/serve": "^1.5.1",
"@webpack-cli/serve": "^1.5.2",
"colorette": "^1.2.1",
"commander": "^7.0.0",
"execa": "^5.0.0",

16
packages/electron/package.json
View File

@ -23,15 +23,15 @@
"devDependencies": {
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^5.2.6",
"electron": "^13.0.1",
"electron-builder": "^22.10.5",
"electron-notarize": "^1.0.0",
"electron": "^14.0.1",
"electron-builder": "^22.11.7",
"electron-notarize": "^1.1.1",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.3.1",
"html-webpack-plugin": "^5.3.2",
"style-loader": "^2.0.0",
"ts-loader": "^9.2.2",
"webpack": "^5.38.1",
"webpack-cli": "^4.7.0"
"ts-loader": "^9.2.5",
"webpack": "^5.52.1",
"webpack-cli": "^4.8.0"
},
"build": {
"appId": "app.padloc",
@ -63,4 +63,4 @@
},
"afterSign": "scripts/notarize.js"
}
}
}

7
packages/electron/src/index.html
View File

@ -8,6 +8,12 @@
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
/>
<script>
if (typeof window.global === "undefined") {
window.global = window;
}
</script>
<style>
html,
body {
@ -59,7 +65,6 @@
rotate linear 1.2s infinite;
}
</style>
</head>
<body>
<svg viewBox="0 0 100 100" class="spinner">

1
packages/electron/src/index.ts
View File

@ -6,6 +6,7 @@ import { ElectronPlatform } from "./platform";
await import("@padloc/app/src/elements/app");
// @ts-ignore
window.router.basePath = window.location.pathname.replace(/index.html$/, "");
window.onload = () => {

54
packages/electron/src/main.ts
View File

@ -3,7 +3,7 @@ import { autoUpdater, UpdateInfo } from "electron-updater";
import * as os from "os";
import ElectronStore from "electron-store";
const debug = process.argv.includes("--debug");
const debug = process.argv.includes("--dbg");
const settings = new ElectronStore({
name: "settings",
@ -12,10 +12,10 @@ const settings = new ElectronStore({
allowPrerelease: autoUpdater.allowPrerelease,
windowBounds: {
width: 800,
height: 600
height: 600,
},
fullscreen: false
}
fullscreen: false,
},
});
let win: BrowserWindow;
@ -28,7 +28,7 @@ async function updateReady(updateInfo: UpdateInfo) {
`Padloc version ${updateInfo.version} has been downloaded. The update will be installed ` +
`the next time the app is launched.`,
buttons: ["Install Later", "Install And Restart"],
defaultId: 1
defaultId: 1,
});
if (response === 1) {
@ -58,7 +58,7 @@ async function updateAvailable(versionInfo: UpdateInfo) {
detail: htmlToText(versionInfo.releaseNotes as string),
checkboxLabel: "Automatically download and install updates in the future (recommended)",
buttons: ["Remind Me Later", "Download And Install"],
defaultId: 1
defaultId: 1,
});
settings.set("autoDownloadUpdates", checkboxChecked);
@ -68,7 +68,7 @@ async function updateAvailable(versionInfo: UpdateInfo) {
dialog.showMessageBox(win, {
message: "Downloading Update...",
detail: "The new version is being downloaded. You'll be notified when it is ready to be installed!"
detail: "The new version is being downloaded. You'll be notified when it is ready to be installed!",
});
}
}
@ -92,7 +92,7 @@ async function checkForUpdates(manual = false) {
message: "No Updates Available",
detail: "Your version of Padloc is up to date.",
checkboxLabel: "Automatically download and install updates in the future (recommended)",
checkboxChecked: settings.get("autoDownloadUpdates") as boolean
checkboxChecked: settings.get("autoDownloadUpdates") as boolean,
});
settings.set("autoDownloadUpdates", checkboxChecked);
@ -116,8 +116,8 @@ function createWindow() {
show: false,
autoHideMenuBar: true,
webPreferences: {
devTools: debug
}
devTools: debug,
},
});
if (debug) {
@ -140,7 +140,7 @@ function createWindow() {
// });
// Open links in browser
win.webContents.on("new-window", function(e, url) {
win.webContents.on("new-window", function (e, url) {
e.preventDefault();
shell.openExternal(url);
});
@ -151,7 +151,7 @@ function createApplicationMenu() {
label: "Check for Updates...",
click() {
checkForUpdates(true);
}
},
};
const appSubMenu: any[] =
@ -172,9 +172,9 @@ function createApplicationMenu() {
{
label: "Open Dev Tools",
accelerator: "CmdOrCtrl+Shift+I",
click: () => win.webContents.toggleDevTools()
}
]
click: () => win.webContents.toggleDevTools(),
},
],
}
);
}
@ -185,7 +185,7 @@ function createApplicationMenu() {
const template = [
{
label: "Application",
submenu: appSubMenu
submenu: appSubMenu,
},
{
label: "Settings",
@ -201,7 +201,7 @@ function createApplicationMenu() {
checked: settings.get("autoDownloadUpdates"),
click(item: any) {
settings.set("autoDownloadUpdates", item.checked);
}
},
},
{ type: "separator" },
{
@ -210,7 +210,7 @@ function createApplicationMenu() {
checked: !settings.get("allowPrerelease"),
click(item: any) {
settings.set("allowPrerelease", !item.checked);
}
},
},
{
type: "radio",
@ -218,12 +218,12 @@ function createApplicationMenu() {
checked: settings.get("allowPrerelease"),
click(item: any) {
settings.set("allowPrerelease", item.checked);
}
}
]
},
},
],
},
{ type: "separator" }
]
{ type: "separator" },
],
},
{
label: "Edit",
@ -234,9 +234,9 @@ function createApplicationMenu() {
{ role: "cut" },
{ role: "copy" },
{ role: "paste" },
{ role: "selectall" }
]
}
{ role: "selectall" },
],
},
];
Menu.setApplicationMenu(Menu.buildFromTemplate(template));
@ -265,7 +265,7 @@ app.on("activate", () => {
}
});
app.on("before-quit", e => {
app.on("before-quit", (e) => {
if (updateOnQuit) {
updateOnQuit = false;
e.preventDefault();

16
packages/electron/tsconfig.json
View File

@ -1,15 +1,3 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"strictPropertyInitialization": false,
"declaration": false,
"emitDecoratorMetadata": true,
"baseUrl": ".",
"outDir": "build",
"sourceMap": true,
"module": "esnext",
"strict": true
},
"include": ["src/**/*.ts", "../app/types/*.ts"],
"exclude": ["node_modules/**/*.ts"]
}
"extends": "../app/tsconfig.json"
}

60
packages/electron/webpack.config.js
View File

@ -3,38 +3,40 @@ const { EnvironmentPlugin, optimize } = require("webpack");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const { description, author, version } = require("./package.json");
const serverUrl = process.env.PL_SERVER_URL || `http://0.0.0.0:${process.env.PL_SERVER_PORT || 3000}`;
module.exports = [
{
target: "electron-renderer",
entry: {
app: path.resolve(__dirname, "src/index.ts")
app: path.resolve(__dirname, "src/index.ts"),
},
output: {
path: path.resolve(__dirname, "app"),
filename: "[name].js",
chunkFilename: "[name].chunk.js"
chunkFilename: "[name].chunk.js",
},
mode: "development",
devtool: "source-map",
stats: "minimal",
resolve: {
extensions: [".ts", ".js"]
extensions: [".ts", ".js"],
},
module: {
rules: [
{
test: /\.ts$/,
loader: "ts-loader"
loader: "ts-loader",
},
{
test: /\.css$/,
use: ["style-loader", "css-loader"]
use: ["style-loader", "css-loader"],
},
{
test: /\.(woff|woff2|eot|ttf|otf|svg)$/,
use: ["file-loader"]
}
]
use: ["file-loader"],
},
],
},
plugins: [
new EnvironmentPlugin({
@ -44,7 +46,7 @@ module.exports = [
PL_BILLING_STRIPE_PUBLIC_KEY: null,
PL_SUPPORT_EMAIL: "support@padloc.app",
PL_VERSION: version,
PL_DISABLE_SW: true
PL_DISABLE_SW: true,
}),
new HtmlWebpackPlugin({
title: "Padloc",
@ -52,47 +54,47 @@ module.exports = [
meta: {
"Content-Security-Policy": {
"http-equiv": "Content-Security-Policy",
content: `default-src 'self' ${process.env.PL_SERVER_URL} ${
content: `default-src 'self' ${serverUrl} ${
process.env.PL_BILLING_ENABLED ? "https://*.stripe.com" : ""
}; style-src 'self' 'unsafe-inline'; object-src 'self' blob:; frame-src 'self' blob: ${
} blob:; style-src 'self' 'unsafe-inline'; object-src 'self' blob:; frame-src 'self' blob: ${
process.env.PL_BILLING_ENABLED ? "https://*.stripe.com" : ""
}; img-src 'self' blob:`
}
}
}; img-src 'self' blob: data:`,
},
},
}),
new optimize.LimitChunkCountPlugin({
maxChunks: 1
})
]
maxChunks: 1,
}),
],
},
{
target: "electron-main",
entry: {
main: path.resolve(__dirname, "src/main.ts")
main: path.resolve(__dirname, "src/main.ts"),
},
output: {
path: path.resolve(__dirname, "app"),
filename: "[name].js",
chunkFilename: "[name].chunk.js"
chunkFilename: "[name].chunk.js",
},
mode: "development",
devtool: "source-map",
stats: "minimal",
resolve: {
extensions: [".ts", ".js"]
extensions: [".ts", ".js"],
},
module: {
rules: [
{
test: /\.ts$/,
loader: "ts-loader"
}
]
loader: "ts-loader",
},
],
},
plugins: [
new EnvironmentPlugin({
PL_SERVER_URL: `http://localhost:${process.env.PL_SERVER_PORT || 3000}`,
PL_STRIPE_PUBLIC_KEY: null
PL_STRIPE_PUBLIC_KEY: null,
}),
{
apply(compiler) {
@ -102,13 +104,13 @@ module.exports = [
// Insert this list into the webpack build as a new file asset:
compilation.assets["package.json"] = {
source: () => package,
size: () => package.length
size: () => package.length,
};
callback();
});
}
}
]
}
},
},
],
},
];

3292
packages/pwa/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
packages/pwa/package.json
View File

@ -30,6 +30,7 @@
"typescript": "^4.3.2",
"webpack": "^5.52.0",
"webpack-cli": "^4.8.0",
"webpack-dev-server": "^4.2.1",
"webpack-pwa-manifest": "^4.3.0",
"workbox-cli": "^6.2.4",
"workbox-webpack-plugin": "^6.1.5"

1
packages/pwa/webpack.config.js
View File

@ -85,7 +85,6 @@ module.exports = {
}),
],
devServer: {
contentBase: path.resolve(__dirname, "dist"),
historyApiFallback: true,
host: "0.0.0.0",
port: process.env.PL_PWA_PORT || 8080,

40280
packages/tauri/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

15
packages/tauri/package.json
View File

@ -10,12 +10,7 @@
},
"author": "",
"license": "ISC",
"dependencies": {
"@tauri-apps/api": "*",
"@tauri-apps/tauri-forage": "^1.0.0-beta.2"
},
"devDependencies": {
"@tauri-apps/cli": "*",
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^5.2.6",
"file-loader": "^6.2.0",
@ -26,6 +21,12 @@
"typescript": "^4.3.2",
"webpack": "^5.38.1",
"webpack-cli": "^4.7.0",
"webpack-dev-server": "^3.11.2"
"webpack-dev-server": "^3.11.2",
"@tauri-apps/cli": "^1.0.0-beta.10"
},
"dependencies": {
"@padloc/app": "^4.0.0",
"@padloc/core": "^4.0.0",
"@tauri-apps/api": "^1.0.0-beta.8"
}
}
}

1449
packages/tauri/src-tauri/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
packages/tauri/src-tauri/Cargo.toml
View File

@ -12,12 +12,12 @@ build = "src/build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies]
tauri-build = { version = "1.0.0-beta.0" }
tauri-build = { version = "1.0.0-beta.4" }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.0.0-beta.1", features = ["api-all"] }
tauri = { version = "1.0.0-beta.8", features = ["api-all"] }
[features]
default = [ "custom-protocol" ]