diff --git a/config/Symphony.config b/config/Symphony.config index 7cf68cb1..fe787684 100644 --- a/config/Symphony.config +++ b/config/Symphony.config @@ -1,14 +1,16 @@ { "url":"https://foundation-dev.symphony.com", - "minimizeOnClose" : true, - "launchOnStartup" : true, - "alwaysOnTop" : false, - "bringToFront": false, + "minimizeOnClose" : "ENABLED", + "launchOnStartup" : "ENABLED", + "alwaysOnTop" : "DISABLED", + "bringToFront": "DISABLED", "whitelistUrl": "*", - "isCustomTitleBar": true, - "memoryRefresh": true, + "isCustomTitleBar": "ENABLED", + "memoryRefresh": "ENABLED", + "memoryThreshold": "800", "devToolsEnabled": true, "contextIsolation": true, + "disableGpu": false, "ctWhitelist": [], "podWhitelist": [], "notificationSettings": { @@ -18,7 +20,6 @@ "customFlags": { "authServerWhitelist": "", "authNegotiateDelegateWhitelist": "", - "disableGpu": false, "disableThrottling": false }, "permissions": { diff --git a/installer/mac/preinstall.sh b/installer/mac/preinstall.sh index efc0fe14..4fdaa4d7 100755 --- a/installer/mac/preinstall.sh +++ b/installer/mac/preinstall.sh @@ -12,7 +12,7 @@ delete_app() compare_versions() { # Get the installer version: - CURRENT_VERSION=6.0.0 + CURRENT_VERSION=APP_VERSION # Get the currently installed version: INSTALLED_VERSION=$(plutil -p /Applications/Symphony.app/Contents/Info.plist | awk '/CFBundleShortVersionString/ {print substr($3, 2, length($3)-2)}') diff --git a/package-lock.json b/package-lock.json index 730744c8..4b9c2b7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4736,9 +4736,9 @@ "dev": true }, "electron": { - "version": "6.1.5", - "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-6.1.5.tgz", - "integrity": "sha1-HxvFQEJYfYNo7dQ//ssM58hMq4c=", + "version": "6.1.7", + "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/electron/-/electron-6.1.7.tgz", + "integrity": "sha1-pnaV+B9ct3Hjlbz5cRVgUg40fFQ=", "dev": true, "requires": { "@types/node": "^10.12.18", @@ -4747,9 +4747,9 @@ }, "dependencies": { "@types/node": { - "version": "10.17.6", - "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/@types/node/-/node-10.17.6.tgz", - "integrity": "sha1-Gqq9b2Rwpqw4JKselNcxyhMm2T0=", + "version": "10.17.13", + "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/@types/node/-/node-10.17.13.tgz", + "integrity": "sha1-zOvNuZC9YTnNFuhMOdwvsQI8qQw=", "dev": true } } @@ -12701,6 +12701,12 @@ "integrity": "sha1-LpZJFZmpbN4bUV1WdKj3qRRSkmo=", "dev": true }, + "run-script-os": { + "version": "1.0.7", + "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/run-script-os/-/run-script-os-1.0.7.tgz", + "integrity": "sha1-fNURRKGcbKNk/maEM/VbR7q/R0k=", + "optional": true + }, "rxjs": { "version": "5.5.11", "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/rxjs/-/rxjs-5.5.11.tgz", @@ -13060,9 +13066,12 @@ } }, "screen-share-indicator-frame": { - "version": "1.1.0", - "resolved": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#14cf6452610252458650056d568918345abf4eb4", - "optional": true + "version": "1.4.0", + "resolved": "git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#adc3fdb0fa96629773ea2bc13b20b9ffd109ac1d", + "optional": true, + "requires": { + "run-script-os": "1.0.7" + } }, "screen-snippet": { "version": "1.0.6", @@ -13908,6 +13917,11 @@ "acorn-node": "^1.2.0" } }, + "systeminformation": { + "version": "4.21.0", + "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/systeminformation/-/systeminformation-4.21.0.tgz", + "integrity": "sha1-BAmd3CGK1CmQxL6A98IexO/2upw=" + }, "tar": { "version": "2.2.1", "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/tar/-/tar-2.2.1.tgz", diff --git a/package.json b/package.json index 820a1369..8e3931ad 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,8 @@ "react": "16.9.0", "react-dom": "16.9.0", "ref-napi": "1.4.1", - "shell-path": "2.1.0" + "shell-path": "2.1.0", + "systeminformation": "4.21.0" }, "optionalDependencies": { "screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet2.git#v1.0.6", diff --git a/spec/__snapshots__/aboutApp.spec.ts.snap b/spec/__snapshots__/aboutApp.spec.ts.snap index 5e3ad69e..010ce1c7 100644 --- a/spec/__snapshots__/aboutApp.spec.ts.snap +++ b/spec/__snapshots__/aboutApp.spec.ts.snap @@ -32,14 +32,10 @@ exports[`about app should render correctly 1`] = `

-
-

- Symphony -

-
-
-

- Electron -

-
  • - Electron: - - - N/A -
  • -
  • - - Chrome: - - - N/A -
  • -
  • - - V8: - - - N/A -
  • -
  • - - Node: - - - N/A -
  • -
-
-
-

- Others -

-
    -
  • - - openssl: - - - N/A -
  • -
  • - - zlib: - - - N/A -
  • -
  • - - uv: - - - N/A -
  • -
  • - - ares: - - - N/A -
  • -
  • - - http_parser: - - - N/A -
  • -
  • - - Swift Search - : - - - N/A -
  • -
  • - - Swift Search API - : + SFE: N/A @@ -164,7 +63,6 @@ exports[`about app should render correctly 1`] = `
-
-
-

Symphony

  • SBE: {podVersion}
  • -
  • SFE: {sfeVersion}
  • SDA: {sdaVersionBuild}
  • -
-
-
-

Electron

-
    -
  • Electron: {electronVersion}
  • -
  • Chrome: {chromeVersion}
  • -
  • V8: {v8Version}
  • -
  • Node: {nodeVersion}
  • -
-
-
-

{i18n.t('Others', ABOUT_SYMPHONY_NAMESPACE)()}

-
    -
  • openssl: {openSslVersion}
  • -
  • zlib: {zlibVersion}
  • -
  • uv: {uvVersion}
  • -
  • ares: {aresVersion}
  • -
  • http_parser: {httpParserVersion}
  • -
  • {i18n.t('Swift Search', ABOUT_SYMPHONY_NAMESPACE)()}: {swiftSearchVersion}
  • -
  • {i18n.t('Swift Search API', ABOUT_SYMPHONY_NAMESPACE)()}: {swiftSearchSupportedVersion}
  • +
  • SFE: {sfeVersion}
-