fix(generator): run install-app-deps on postuninstall, fixes #168

Author: nklayman

__tests__/generator.spec.js

@@ -126,7 +126,7 @@ describe('background.js', () => {
     fs.readFileSync.mockImplementation((path, encoding) => {
       // Check that utf8 encoding is set
       expect(encoding).toBe('utf8')
-      // Mock existing postinstall script in app's package.json
+      // Mock existing scripts in app's package.json
       if (path === 'apiResolve_./package.json') {
         return JSON.stringify({
           scripts: {}
@@ -144,22 +144,20 @@ describe('background.js', () => {
   })
 })
 
-describe('package.json', () => {
-  test('Adds electron-builder install-app-deps to postInstall', () => {
+describe.each(['postinstall', 'postuninstall'])('package.json (%s)', script => {
+  test(`Adds electron-builder install-app-deps to ${script}`, () => {
     generator(mockApi)
     completionCb()
-    expect(pkg.scripts.postinstall).toBe('electron-builder install-app-deps')
+    expect(pkg.scripts[script]).toBe('electron-builder install-app-deps')
   })
 
-  test('Adds on to existing postinstall script instead of replacing', () => {
+  test(`Adds on to existing ${script} script instead of replacing`, () => {
     fs.readFileSync.mockImplementation((path, encoding) => {
       // Check that utf8 encoding is set
       expect(encoding).toBe('utf8')
-      // Mock existing postinstall script in app's package.json
+      // Mock existing script in app's package.json
       if (path === 'apiResolve_./package.json') {
-        return JSON.stringify({
-          scripts: { postinstall: 'existingTask' }
-        })
+        return `{"scripts": { "${script}": "existingTask" }}`
       }
       // return mock content
       return 'existing_content'
@@ -168,7 +166,7 @@ describe('package.json', () => {
     generator(mockApi)
     completionCb()
 
-    expect(pkg.scripts.postinstall).toBe(
+    expect(pkg.scripts[script]).toBe(
       'existingTask && electron-builder install-app-deps'
     )
   })
@@ -177,13 +175,13 @@ describe('package.json', () => {
     fs.readFileSync.mockImplementation((path, encoding) => {
       // Check that utf8 encoding is set
       expect(encoding).toBe('utf8')
-      // Mock existing postinstall script in app's package.json
+      // Mock existing script in app's package.json
       if (path === 'apiResolve_./package.json') {
-        return JSON.stringify({
-          scripts: {
-            postinstall: 'existingTask && electron-builder install-app-deps'
+        return `{
+          "scripts": {
+            "${script}": "existingTask && electron-builder install-app-deps"
           }
-        })
+        }`
       }
       // return mock content
       return 'existing_content'
@@ -192,7 +190,7 @@ describe('package.json', () => {
     generator(mockApi)
     completionCb()
 
-    expect(pkg.scripts.postinstall).toBe(
+    expect(pkg.scripts[script]).toBe(
       'existingTask && electron-builder install-app-deps'
     )
   })

generator/index.js

@@ -59,35 +59,38 @@ module.exports = (api, options = {}) => {
     }
   })
 
-  // Add electron-builder install-app-deps to postinstall
-  let postinstallScript
+  // Add electron-builder install-app-deps to postinstall and postuninstall
+  const scripts = {
+    'electron:build': 'vue-cli-service electron:build',
+    'electron:serve': 'vue-cli-service electron:serve'
+  }
   let pkg = fs.readFileSync(api.resolve('./package.json'), 'utf8')
   pkg = JSON.parse(pkg)
-  // Add on to existing script if it exists
-  if (pkg.scripts && pkg.scripts.postinstall) {
-    // Don't re-add script
-    if (!pkg.scripts.postinstall.match('electron-builder install-app-deps')) {
-      postinstallScript =
-        pkg.scripts.postinstall + ' && electron-builder install-app-deps'
+  const addScript = (name, command) => {
+    // Add on to existing script if it exists
+    if (pkg.scripts && pkg.scripts[name]) {
+      // Don't re-add script
+      if (!pkg.scripts[name].match(command)) {
+        // add command to existing script
+        scripts[name] = pkg.scripts[name] + ` && ${command}`
+      } else {
+        // command already exists, don't change it
+        scripts[name] = pkg.scripts[name]
+      }
     } else {
-      // electron-builder install-app-deps already exists
-      postinstallScript = pkg.scripts.postinstall
+      // Create new postinstall script
+      scripts[name] = command
     }
-  } else {
-    // Create new postinstall script
-    postinstallScript = 'electron-builder install-app-deps'
   }
+  addScript('postinstall', 'electron-builder install-app-deps')
+  addScript('postuninstall', 'electron-builder install-app-deps')
   const devDependencies = {}
   if (options.electronBuilder.electronVersion) {
     // Use provided electron version
     devDependencies.electron = options.electronBuilder.electronVersion
   }
   api.extendPackage({
-    scripts: {
-      'electron:build': 'vue-cli-service electron:build',
-      'electron:serve': 'vue-cli-service electron:serve',
-      postinstall: postinstallScript
-    },
+    scripts,
     devDependencies,
     main: 'background.js'
   })