From 5977ed864233bf8ea42178caff9c27f86682763e Mon Sep 17 00:00:00 2001 From: Kiran Niranjan Date: Thu, 16 Jun 2022 12:32:30 +0530 Subject: [PATCH] SDA-3733 - Fix general code issues, Include everything from node_modules (#1445) --- installer/win/WixSharpInstaller/Symphony.cs | 9 ++--- package-lock.json | 37 +++++---------------- package.json | 2 +- src/app/init.ts | 1 - tsconfig.json | 1 + 5 files changed, 12 insertions(+), 38 deletions(-) diff --git a/installer/win/WixSharpInstaller/Symphony.cs b/installer/win/WixSharpInstaller/Symphony.cs index 6c73de75..98e28cc1 100644 --- a/installer/win/WixSharpInstaller/Symphony.cs +++ b/installer/win/WixSharpInstaller/Symphony.cs @@ -61,7 +61,7 @@ class Script // desired contents of installation, and then we can simplify this bit. var project = new ManagedProject(productName, new Dir(@"%ProgramFiles%\" + productName, - new File(new Id("symphony_exe"), @"..\..\..\dist\win-unpacked\Symphony.exe", + new File(new Id("com.symphony.electron-desktop"), @"..\..\..\dist\win-unpacked\Symphony.exe", // Create two shortcuts to the main Symphony.exe file, one on the desktop and one in the program menu new FileShortcut(productName, @"%Desktop%") { @@ -113,12 +113,7 @@ class Script new DirFiles(@"..\..\..\dist\win-unpacked\resources\*.*"), new Dir(@"app.asar.unpacked", new Dir(@"node_modules", - new Dir(@"ffi-napi\build\Release", - new File(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\ffi-napi\build\Release\ffi_bindings.node") - ), - new Dir(@"ref-napi\build\Release", - new Files(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\ref-napi\prebuilds\*.*") - ) + new Files(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\*.*") ) ) ) diff --git a/package-lock.json b/package-lock.json index 418fb038..5114ec20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,7 @@ "prettier": "2.2.1", "pretty-quick": "^3.1.0", "robotjs": "0.6.0", - "run-script-os": "1.1.6", + "run-script-os": "^1.1.6", "spectron": "^15.0.0", "ts-jest": "25.3.0", "tslint": "5.11.0", @@ -20527,7 +20527,7 @@ "version": "1.1.6", "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/run-script-os/-/run-script-os-1.1.6.tgz", "integrity": "sha1-iwF3+xtUyZpnD5XH/cVPGLnHI0c=", - "dev": true, + "devOptional": true, "license": "MIT", "bin": { "run-os": "index.js", @@ -20840,9 +20840,8 @@ } }, "node_modules/screen-share-indicator-frame": { - "version": "1.4.10", - "resolved": "git+ssh://git@github.com/symphonyoss/ScreenShareIndicatorFrame.git#e943ec141899d8cf7301f4bd3f91a1434e1ceb10", - "integrity": "sha512-/M9RZDlqWss6tjnDOx9w2kd8/oeNY5vE6nH4vNuz9MxSsZ3uc6zajcHMgYLreS7h6hxf21lrYuD+o8n7m3+5lQ==", + "version": "1.4.13", + "resolved": "git+ssh://git@github.com/symphonyoss/ScreenShareIndicatorFrame.git#f5748cb8b1f5a2a92b8d44efd46f195b38e00552", "hasInstallScript": true, "license": "ISC", "optional": true, @@ -20851,18 +20850,7 @@ "darwin" ], "dependencies": { - "run-script-os": "1.0.7" - } - }, - "node_modules/screen-share-indicator-frame/node_modules/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=", - "license": "MIT", - "optional": true, - "bin": { - "run-os": "index.js", - "run-script-os": "index.js" + "run-script-os": "1.1.6" } }, "node_modules/screen-snippet": { @@ -40428,7 +40416,7 @@ "version": "1.1.6", "resolved": "https://repo.symphony.com/artifactory/api/npm/npm-virtual-dev/run-script-os/-/run-script-os-1.1.6.tgz", "integrity": "sha1-iwF3+xtUyZpnD5XH/cVPGLnHI0c=", - "dev": true + "devOptional": true }, "safe-buffer": { "version": "5.1.2", @@ -40672,20 +40660,11 @@ } }, "screen-share-indicator-frame": { - "version": "git+ssh://git@github.com/symphonyoss/ScreenShareIndicatorFrame.git#e943ec141899d8cf7301f4bd3f91a1434e1ceb10", - "integrity": "sha512-/M9RZDlqWss6tjnDOx9w2kd8/oeNY5vE6nH4vNuz9MxSsZ3uc6zajcHMgYLreS7h6hxf21lrYuD+o8n7m3+5lQ==", + "version": "git+ssh://git@github.com/symphonyoss/ScreenShareIndicatorFrame.git#f5748cb8b1f5a2a92b8d44efd46f195b38e00552", "from": "screen-share-indicator-frame@git+https://github.com/symphonyoss/ScreenShareIndicatorFrame.git#v1.4.13", "optional": true, "requires": { - "run-script-os": "1.0.7" - }, - "dependencies": { - "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 - } + "run-script-os": "1.1.6" } }, "screen-snippet": { diff --git a/package.json b/package.json index cb284e69..536c9631 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "prettier": "2.2.1", "pretty-quick": "^3.1.0", "robotjs": "0.6.0", - "run-script-os": "1.1.6", + "run-script-os": "^1.1.6", "spectron": "^15.0.0", "ts-jest": "25.3.0", "tslint": "5.11.0", diff --git a/src/app/init.ts b/src/app/init.ts index ecffa598..a9816756 100644 --- a/src/app/init.ts +++ b/src/app/init.ts @@ -19,7 +19,6 @@ const userDataPath = // If we are running in production, sandbox the entire app // and set the app user model id for windows native notifications app.enableSandbox(); -app.setAppUserModelId('symphony_exe'); // need to set this explicitly if using Squirrel // https://www.electron.build/configuration/configuration#Configuration-squirrelWindows diff --git a/tsconfig.json b/tsconfig.json index ab77e33b..8b0a3d4b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,6 +20,7 @@ "strictNullChecks": true, "noUnusedLocals": true, "noImplicitThis": true, + "skipLibCheck": true, "noUnusedParameters": true, "typeRoots": ["node_modules/@types"] },