diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 000000000..3cacc0b93
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+12
\ No newline at end of file
diff --git a/docs/_config.yml b/docs/_config.yml
index c7cfd862c..f92a523e2 100755
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -18,7 +18,7 @@ baseurl: "" # the subpath of your site, e.g. /blog
url: "https://getwebcatalog.com" # the base hostname & protocol for your site, e.g. http://example.com
# Custom
-webcatalog_version: 14.2.1
+webcatalog_version: 14.3.0
collections:
catalog:
output: true
diff --git a/docs/_includes/head.html b/docs/_includes/head.html
index 0e476eb97..1934667fc 100755
--- a/docs/_includes/head.html
+++ b/docs/_includes/head.html
@@ -3,7 +3,7 @@
-
{% if page.title %}{{ page.title | escape }} - {{ site.title | escape }}{% else %}{{ site.title | escape }} - - Run Web Apps like Real Apps{% endif %}
+ {% if page.title %}{{ page.title | escape }} - {{ site.title | escape }}{% else %}{{ site.title | escape }} - Run Web Apps like Real Apps{% endif %}
diff --git a/docs/catalog.html b/docs/catalog.html
index c2f6b70ce..efbec9a38 100644
--- a/docs/catalog.html
+++ b/docs/catalog.html
@@ -1,6 +1,7 @@
---
permalink: /catalog/
layout: default
+title: Catalog
---
diff --git a/package.json b/package.json
index 4aded98e0..9fbdc4be3 100755
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "WebCatalog",
"description": "Run Web Apps like Real Apps",
- "version": "14.2.1",
- "templateVersion": "4.2.0",
+ "version": "14.3.0",
+ "templateVersion": "4.3.0",
"engines": {
"node": ">=12.0.0 <13.0.0"
},
@@ -61,7 +61,7 @@
"concurrently": "4.1.1",
"cross-env": "5.2.0",
"electron": "6.0.0",
- "electron-builder": "21.1.5",
+ "electron-builder": "21.2.0",
"eslint": "5.16.0",
"eslint-config-airbnb": "17.1.1",
"eslint-plugin-import": "2.18.0",
diff --git a/src/components/pages/home/index.js b/src/components/pages/home/index.js
index 194cf7473..59fead02b 100755
--- a/src/components/pages/home/index.js
+++ b/src/components/pages/home/index.js
@@ -35,6 +35,7 @@ const styles = theme => ({
flex: 1,
display: 'flex',
flexDirection: 'column',
+ overflow: 'hidden',
},
title: {
flex: 1,
diff --git a/src/components/pages/installed/index.js b/src/components/pages/installed/index.js
index 47f5d40bf..761447336 100755
--- a/src/components/pages/installed/index.js
+++ b/src/components/pages/installed/index.js
@@ -25,6 +25,7 @@ const styles = theme => ({
flex: 1,
display: 'flex',
flexDirection: 'column',
+ overflow: 'hidden',
},
toolbar: {
minHeight: '56px !important',
diff --git a/src/components/pages/preferences/index.js b/src/components/pages/preferences/index.js
index c7eb3ee28..8742f508b 100644
--- a/src/components/pages/preferences/index.js
+++ b/src/components/pages/preferences/index.js
@@ -37,6 +37,7 @@ const styles = theme => ({
flex: 1,
display: 'flex',
flexDirection: 'column',
+ overflow: 'hidden',
},
title: {
flex: 1,
diff --git a/template/package.json b/template/package.json
index 86ce386a4..5a056bd6d 100755
--- a/template/package.json
+++ b/template/package.json
@@ -1,7 +1,7 @@
{
"name": "Juli",
"description": "AppView template for WebCatalog",
- "version": "4.2.0",
+ "version": "4.3.0",
"engines": {
"node": ">=12.0.0 <13.0.0"
},
diff --git a/template/public/listeners/index.js b/template/public/listeners/index.js
index e98e006b5..c447152c4 100755
--- a/template/public/listeners/index.js
+++ b/template/public/listeners/index.js
@@ -35,6 +35,8 @@ const {
const createMenu = require('../libs/create-menu');
+const { checkForUpdates } = require('../libs/updater');
+
const mainWindow = require('../windows/main');
const preferencesWindow = require('../windows/preferences');
const editWorkspaceWindow = require('../windows/edit-workspace');
@@ -260,6 +262,10 @@ const loadListeners = () => {
win.getBrowserView().webContents.reload();
}
});
+
+ ipcMain.on('check-for-updates', () => {
+ checkForUpdates();
+ });
};
module.exports = loadListeners;
diff --git a/template/public/windows/main.js b/template/public/windows/main.js
index 5043a2506..ef20578e4 100644
--- a/template/public/windows/main.js
+++ b/template/public/windows/main.js
@@ -11,10 +11,6 @@ const path = require('path');
const { REACT_PATH } = require('../constants');
const { getPreference } = require('../libs/preferences');
-const {
- checkForUpdates,
-} = require('../libs/updater');
-
let win;
let mb = {};
@@ -42,7 +38,7 @@ const createAsync = () => {
{ role: 'about' },
{
label: 'Check for Updates...',
- click: () => checkForUpdates(),
+ click: () => ipcMain.emit('check-for-updates'),
},
{ type: 'separator' },
{
diff --git a/yarn.lock b/yarn.lock
index 1fff647d7..7c5068edf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2089,54 +2089,26 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
-app-builder-bin@3.4.2:
- version "3.4.2"
- resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.4.2.tgz#4684003fb319d8bc154b1b6e9ce006bba1602fa9"
- integrity sha512-E9VvUrZm60oLl0rvLw/ErvZiEOIHkulZbJ9C9TWMD4ftNrkXFc2+a5JGlD19Bwvj329d4qz91zs/hWD01q18TQ==
+app-builder-bin@3.4.3:
+ version "3.4.3"
+ resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.4.3.tgz#58a74193eb882f029be6b7f0cd3f0c6805927a6b"
+ integrity sha512-qMhayIwi3juerQEVJMQ76trObEbfQT0nhUdxZz9a26/3NLT3pE6awmQ8S1cEnrGugaaM5gYqR8OElcDezfmEsg==
-app-builder-lib@21.1.5:
- version "21.1.5"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.1.5.tgz#355eefcee415b61e224dfdfbc8eb4e74bd1e88c4"
- integrity sha512-hLsSVSstMTq33a9jbBStrF0e+fa6eWXWIpsatPvHnJlkjx7dAZ5d2cZPe/1bAO3bCL3afpRl5j+HU853eGfDCg==
+app-builder-lib@21.2.0, app-builder-lib@~21.2.0:
+ version "21.2.0"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.2.0.tgz#fa1d1604601431e2c3476857e9b9b61d33ad26cc"
+ integrity sha512-aOX/nv77/Bti6NymJDg7p9T067xD8m1ipIEJR7B4Mm1GsJWpMm9PZdXtCRiMNRjHtQS5KIljT0g17781y6qn5A==
dependencies:
"7zip-bin" "~5.0.3"
"@develar/schema-utils" "~2.1.0"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9"
- builder-util "21.1.5"
+ builder-util "21.2.0"
builder-util-runtime "8.3.0"
chromium-pickle-js "^0.2.0"
debug "^4.1.1"
ejs "^2.6.2"
- electron-publish "21.1.5"
- fs-extra "^8.1.0"
- hosted-git-info "^2.7.1"
- is-ci "^2.0.0"
- isbinaryfile "^4.0.2"
- js-yaml "^3.13.1"
- lazy-val "^1.0.4"
- minimatch "^3.0.4"
- normalize-package-data "^2.5.0"
- read-config-file "5.0.0"
- sanitize-filename "^1.6.1"
- semver "^6.3.0"
- temp-file "^3.3.4"
-
-app-builder-lib@~21.1.5:
- version "21.1.6"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-21.1.6.tgz#25db48342ba4a512b9d4cff447319b59115b35a2"
- integrity sha512-SNahybyQkFRFxi6OloKo5CndBq5SsqsaU6cPJAqt78abYCwUhxfpX63ajB1NdhwaEQaBG9OVshuOFgqLB7tE1g==
- dependencies:
- "7zip-bin" "~5.0.3"
- "@develar/schema-utils" "~2.1.0"
- async-exit-hook "^2.0.1"
- bluebird-lst "^1.0.9"
- builder-util "21.1.6"
- builder-util-runtime "8.3.0"
- chromium-pickle-js "^0.2.0"
- debug "^4.1.1"
- ejs "^2.6.2"
- electron-publish "21.1.6"
+ electron-publish "21.2.0"
fs-extra "^8.1.0"
hosted-git-info "^2.7.1"
is-ci "^2.0.0"
@@ -3395,33 +3367,14 @@ builder-util-runtime@8.3.0:
debug "^4.1.1"
sax "^1.2.4"
-builder-util@21.1.5:
- version "21.1.5"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-21.1.5.tgz#2fb37118c5d6c6f7932a4b489536782a1529af43"
- integrity sha512-RBr06OnoTKTkg0W7Om2dnuKe8I82CiciU9EdsNnLO8DAfH0ZVCPsVpc3qYmr7g/7cH3zXA3yyQP73QDGNpbVYQ==
- dependencies:
- "7zip-bin" "~5.0.3"
- "@types/debug" "^4.1.4"
- app-builder-bin "3.4.2"
- bluebird-lst "^1.0.9"
- builder-util-runtime "8.3.0"
- chalk "^2.4.2"
- debug "^4.1.1"
- fs-extra "^8.1.0"
- is-ci "^2.0.0"
- js-yaml "^3.13.1"
- source-map-support "^0.5.12"
- stat-mode "^0.3.0"
- temp-file "^3.3.4"
-
-builder-util@21.1.6, builder-util@~21.1.5, builder-util@~21.1.6:
- version "21.1.6"
- resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-21.1.6.tgz#4c36ee24280d4cbde0ac314e5a5dd37e520a4fab"
- integrity sha512-iff0hrUq1wVvOEr87Tg6mhnzD0ItsTxAn3D/Q/imCjWtOegDRV93VSB8A8xLdjYdkCcACvmPr3FJyIhyUP8nRA==
+builder-util@21.2.0, builder-util@~21.2.0:
+ version "21.2.0"
+ resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-21.2.0.tgz#aba721190e4e841009d9fb4b88f1130ed616522f"
+ integrity sha512-Nd6CUb6YgDY8EXAXEIegx+1kzKqyFQ5ZM5BoYkeunAlwz/zDJoH1UCyULjoS5wQe5czNClFQy07zz2bzYD0Z4A==
dependencies:
"7zip-bin" "~5.0.3"
"@types/debug" "^4.1.4"
- app-builder-bin "3.4.2"
+ app-builder-bin "3.4.3"
bluebird-lst "^1.0.9"
builder-util-runtime "8.3.0"
chalk "^2.4.2"
@@ -3429,7 +3382,7 @@ builder-util@21.1.6, builder-util@~21.1.5, builder-util@~21.1.6:
fs-extra "^8.1.0"
is-ci "^2.0.0"
js-yaml "^3.13.1"
- source-map-support "^0.5.12"
+ source-map-support "^0.5.13"
stat-mode "^0.3.0"
temp-file "^3.3.4"
@@ -4713,18 +4666,18 @@ dir-glob@2.0.0:
arrify "^1.0.1"
path-type "^3.0.0"
-dmg-builder@21.1.5:
- version "21.1.5"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-21.1.5.tgz#c84f46562189e1b7e887f68d8e40e9c3dd394c96"
- integrity sha512-o9rZua7mzNzZIo9SZJi57ZXe4zjNaajxEJ0LO/8k2z8Q2CL57RIaJZ95sA6G0dC1/g5Gm4cmW3O5nv9Ur8Ayow==
+dmg-builder@21.2.0:
+ version "21.2.0"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-21.2.0.tgz#a9c883557cacb9abdb66c7133b30fe921c1a3ba7"
+ integrity sha512-9cJEclnGy7EyKFCoHDYDf54pub/t92CQapyiUxU0w9Bj2vUvfoDagP1PMiX4XD5rPp96141h9A+QN0OB4VgvQg==
dependencies:
- app-builder-lib "~21.1.5"
+ app-builder-lib "~21.2.0"
bluebird-lst "^1.0.9"
- builder-util "~21.1.5"
+ builder-util "~21.2.0"
fs-extra "^8.1.0"
iconv-lite "^0.5.0"
js-yaml "^3.13.1"
- sanitize-filename "^1.6.1"
+ sanitize-filename "^1.6.2"
dns-equal@^1.0.0:
version "1.0.0"
@@ -4918,22 +4871,22 @@ ejs@^2.6.2:
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.2.tgz#3a32c63d1cd16d11266cd4703b14fec4e74ab4f6"
integrity sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==
-electron-builder@21.1.5:
- version "21.1.5"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.1.5.tgz#a0129c6dd857b896d837f40aff8f9fb925f9f683"
- integrity sha512-2tEgBESGWQ661dC9/rZlpbtmhlofoNPwnkO6KUuCZUBYpFMRvpMzH2IF7vQYsCst78yxnrV0CtiBePhM1i+DfA==
+electron-builder@21.2.0:
+ version "21.2.0"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-21.2.0.tgz#b68ec4def713fc0b8602654ce842f972432f50c5"
+ integrity sha512-x8EXrqFbAb2L3N22YlGar3dGh8vwptbB3ovo3OF6K7NTpcsmM2zEoJv7GhFyX73rNzSG2HaWpXwGAtOp2JWiEw==
dependencies:
- app-builder-lib "21.1.5"
+ app-builder-lib "21.2.0"
bluebird-lst "^1.0.9"
- builder-util "21.1.5"
+ builder-util "21.2.0"
builder-util-runtime "8.3.0"
chalk "^2.4.2"
- dmg-builder "21.1.5"
+ dmg-builder "21.2.0"
fs-extra "^8.1.0"
is-ci "^2.0.0"
lazy-val "^1.0.4"
read-config-file "5.0.0"
- sanitize-filename "^1.6.1"
+ sanitize-filename "^1.6.2"
update-notifier "^3.0.1"
yargs "^13.3.0"
@@ -5000,26 +4953,13 @@ electron-packager@14.0.4:
semver "^6.0.0"
yargs-parser "^13.0.0"
-electron-publish@21.1.5:
- version "21.1.5"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.1.5.tgz#f1d9c45835442ccf767124f020f03db06ed629f9"
- integrity sha512-EgFxZJBrb+EBUcEwg8RNKouoBaOEpACnjLi+ipUsk72x+/6kzhcofAYBchIkGns7meengoXy7QdoiThgpr6rew==
+electron-publish@21.2.0:
+ version "21.2.0"
+ resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.2.0.tgz#cc225cb46aa62e74b899f2f7299b396c9802387d"
+ integrity sha512-mWavuoWJe87iaeKd0I24dNWIaR+0yRzshjNVqGyK019H766fsPWl3caQJnVKFaEyrZRP397v4JZVG0e7s16AxA==
dependencies:
bluebird-lst "^1.0.9"
- builder-util "~21.1.5"
- builder-util-runtime "8.3.0"
- chalk "^2.4.2"
- fs-extra "^8.1.0"
- lazy-val "^1.0.4"
- mime "^2.4.4"
-
-electron-publish@21.1.6:
- version "21.1.6"
- resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-21.1.6.tgz#aafd5863f791e28cc2f1e0c28e7190650c427717"
- integrity sha512-JH0fWkMjiHssw4G9IMvAJN4YNV+pV6V92iNqEu2IvDJAs8fkSszcG/uZe/YanR8vUrLugreJE5BOZyjdfiMa9w==
- dependencies:
- bluebird-lst "^1.0.9"
- builder-util "~21.1.6"
+ builder-util "~21.2.0"
builder-util-runtime "8.3.0"
chalk "^2.4.2"
fs-extra "^8.1.0"
@@ -11385,7 +11325,7 @@ sane@^4.0.3:
minimist "^1.1.1"
walker "~1.0.5"
-sanitize-filename@^1.6.0, sanitize-filename@^1.6.1:
+sanitize-filename@^1.6.0:
version "1.6.1"
resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
integrity sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=
@@ -11752,7 +11692,15 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@^0.5.12, source-map-support@^0.5.6, source-map-support@~0.5.10, source-map-support@~0.5.12:
+source-map-support@^0.5.13:
+ version "0.5.13"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+ integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+ dependencies:
+ buffer-from "^1.0.0"
+ source-map "^0.6.0"
+
+source-map-support@^0.5.6, source-map-support@~0.5.10, source-map-support@~0.5.12:
version "0.5.12"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==