Upgrade to Electron 1.6.1

gulpfile.babel.js

@@ -10,6 +10,7 @@ import concat from 'gulp-concat';
 import cssmin from 'gulp-cssmin';
 import { createWindowsInstaller as electronInstaller } from 'gpmdp-electron-winstaller';
 import fs from 'fs';
+import globber from 'glob';
 import header from 'gulp-header';
 import less from 'gulp-less';
 import packager from 'electron-packager';
@@ -47,7 +48,15 @@ const defaultPackageConf = {
   'app-category-type': 'public.app-category.music',
   'app-copyright': `Copyright © ${(new Date()).getFullYear()} ${packageJSON.author.name}, All rights reserved.`, // eslint-disable-line
   'app-version': packageJSON.version,
-  afterCopy: [(buildPath, electronVersion, pPlatform, pArch, done) => rebuild(buildPath, electronVersion, pArch).then(() => done()).catch(done)],
+  afterCopy: [
+    (buildPath, electronVersion, pPlatform, pArch, done) => rebuild(buildPath, electronVersion, pArch).then(() => done()).catch(done),
+    (buildPath, electronVersion, pPlatform, pArch, done) => {
+      const files = globber.sync(nodePath.resolve(buildPath, '**', '*.pdb'))
+        .concat(globber.sync(nodePath.resolve(buildPath, '**', '*.obj')));
+      files.forEach(filePath => fs.unlinkSync(filePath));
+      done();
+    },
+  ],
   arch: 'all',
   asar: true,
   'build-version': packageJSON.version,
@@ -293,11 +302,20 @@ gulp.task('make:win:uwp', ['package:win'], (done) => {
     flatten: true,
     packageVersion: `${packageJSON.version}.0`,
     packageName: 'GPMDP',
-    packageDisplayName: packageJSON.productName,
+    packageDisplayName: 'GPMDP',
     packageDescription: packageJSON.description,
     packageExecutable: `app\\${packageJSON.productName}.exe`,
-    publisher: 'CN=marshallca',
+    publisher: 'CN=E800FCD7-1562-414E-A4AC-F1BA78F4A060',
+    publisherDisplayName: 'Samuel Attard',
     assets: 'build\\assets\\img\\assets',
+    devCert: nodePath.resolve(__dirname, '.uwp.pfx'),
+    signtoolParams: ['/p', process.env.SIGN_CERT_PASS],
+    finalSay: () => new Promise((resolve) => {
+      const manifestPath = nodePath.resolve(__dirname, 'dist/uwp/pre-appx/appxmanifest.xml');
+      const manifest = fs.readFileSync(manifestPath, 'utf8').replace('<Identity Name="GPMDP"', '<Identity Name="24619SamuelAttard.GPMDP"');
+      fs.writeFileSync(manifestPath, manifest);
+      resolve();
+    }),
   }).then(() => done()).catch(done);
 });
 

package.json

@@ -59,7 +59,7 @@
   "dependencies": {
     "archiver": "^1.0.1",
     "auto-launch": "^4.0.0",
-    "electron": "1.6.0",
+    "electron": "1.6.1",
     "electron-chromecast": "^1.0.17",
     "gmusic-mini-player.js": "^2.0.10",
     "gmusic-theme.js": "^2.1.7",
@@ -77,7 +77,7 @@
     "react": "^15.3.1",
     "react-color": "^2.3.4",
     "react-dom": "^15.3.1",
-    "react-tap-event-plugin": "^2.0.1",
+    "react-tap-event-plugin": "2.0.1",
     "request": "^2.72.0",
     "runas": "^3.1.1",
     "semver": "^5.3.0",
@@ -105,7 +105,7 @@
     "electron-mocha": "^3.0.0",
     "electron-packager": "^8.0.0",
     "electron-rebuild": "^1.5.6",
-    "electron-windows-store": "^0.7.3",
+    "electron-windows-store": "^0.9.3",
     "enzyme": "^2.4.1",
     "eslint": "^2.10.2",
     "eslint-config-airbnb": "^9.0.1",

src/renderer/windows/GPMWebView/index.js

@@ -69,3 +69,5 @@ const waitForExternal = setInterval(() => {
     Settings.set('gpmdp_connect_email', window.gbar._CONFIG[0][10][5]);
   }
 }, 10);
+
+if (remote.getGlobal('DEV_MODE')) window.__devtron = { require, process };