dependencies: Use one package.json structure.

The two package.json structure is no longer needed.
https://www.electron.build/tutorials/two-package-structure

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>

.gitignore

@@ -1,5 +1,5 @@
-# Dependency directories
+# Dependency directory
-node_modules/
+/node_modules/
 
 # npm cache directory
 .npm

.travis.yml

@@ -21,13 +21,11 @@ node_js:
 before_install:
   - ./scripts/travis-xvfb.sh
   - npm install -g gulp
-  - (cd app && npm ci --ignore-scripts)
   - npm ci
 
 cache:
   directories:
   - node_modules
-  - app/node_modules
 
 script:
 - npm run travis

app/package.json

@@ -1,52 +0,0 @@
-{
-  "name": "zulip",
-  "productName": "Zulip",
-  "version": "4.1.0-beta",
-  "desktopName": "zulip.desktop",
-  "description": "Zulip Desktop App",
-  "license": "Apache-2.0",
-  "copyright": "Kandra Labs, Inc.",
-  "author": {
-    "name": "Kandra Labs, Inc.",
-    "email": "support@zulipchat.com"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/zulip/zulip-desktop.git"
-  },
-  "bugs": {
-    "url": "https://github.com/zulip/zulip-desktop/issues"
-  },
-  "main": "main/index.js",
-  "keywords": [
-    "Zulip",
-    "Group Chat app",
-    "electron-app",
-    "electron",
-    "Desktop app",
-    "InstantMessaging"
-  ],
-  "dependencies": {
-    "@electron-elements/send-feedback": "^1.0.8",
-    "@sentry/electron": "^1.2.1",
-    "adm-zip": "^0.4.14",
-    "auto-launch": "^5.0.5",
-    "backoff": "^2.5.0",
-    "crypto-random-string": "^3.1.0",
-    "dotenv": "^8.2.0",
-    "electron-is-dev": "^1.1.0",
-    "electron-log": "^4.0.7",
-    "electron-spellchecker": "^2.2.1",
-    "electron-updater": "^4.2.2",
-    "electron-window-state": "^5.0.3",
-    "escape-html": "^1.0.3",
-    "i18n": "^0.8.5",
-    "node-json-db": "^1.0.3",
-    "request": "^2.88.2",
-    "semver": "^7.1.3",
-    "wurl": "^2.5.4"
-  },
-  "optionalDependencies": {
-    "node-mac-notifier": "^1.1.0"
-  }
-}

package.json

@@ -50,7 +50,7 @@
       "**/*.node"
     ],
     "files": [
-      "**/*",
+      "app/**/*",
       "!**/node_modules/cld/deps/cld"
     ],
     "copyright": "©2019 Kandra Labs, Inc.",
@@ -151,6 +151,29 @@
     "Desktop app",
     "InstantMessaging"
   ],
+  "dependencies": {
+    "@electron-elements/send-feedback": "^1.0.8",
+    "@sentry/electron": "^1.2.1",
+    "adm-zip": "^0.4.14",
+    "auto-launch": "^5.0.5",
+    "backoff": "^2.5.0",
+    "crypto-random-string": "^3.1.0",
+    "dotenv": "^8.2.0",
+    "electron-is-dev": "^1.1.0",
+    "electron-log": "^4.0.7",
+    "electron-spellchecker": "^2.2.1",
+    "electron-updater": "^4.2.2",
+    "electron-window-state": "^5.0.3",
+    "escape-html": "^1.0.3",
+    "i18n": "^0.8.5",
+    "node-json-db": "^1.0.3",
+    "request": "^2.88.2",
+    "semver": "^7.1.3",
+    "wurl": "^2.5.4"
+  },
+  "optionalDependencies": {
+    "node-mac-notifier": "^1.1.0"
+  },
   "devDependencies": {
     "@types/adm-zip": "^0.4.32",
     "@typescript-eslint/eslint-plugin": "^2.22.0",

tools/reinstall-node-modules

@@ -2,9 +2,8 @@
 set -e
 set -x
 
-echo "Removing node_modules and app/node_modules"
+echo "Removing node_modules"
 rm -rf node_modules
-rm -rf app/node_modules
 
 echo "node_modules removed reinstalling npm packages"
 npm i

tools/reinstall-node-modules.cmd

@@ -1,8 +1,7 @@
 @echo off
 
-echo "Removing node_modules and app/node_modules"
+echo "Removing node_modules"
 rmdir /s /q node_modules
-rmdir /s /q app/node_modules
 
 echo "node_modules removed reinstalling npm packages"
 npm i

troubleshooting.md

@@ -5,7 +5,7 @@
 * Electron is more or less Chrome, you can get developer tools using `CMD+ALT+I`
 
 ### Error : ChecksumMismatchError
-- Try deleteing `node_modules` && `app/node_modules` directories. Re-install dependencies using `npm install`
+- Try deleting the `node_modules` directory and reinstalling dependencies using `npm install`
 
 ### Error : Module version mismatch. Expected 50, got 51
 - Make sure you have installed [node-gyp](https://github.com/nodejs/node-gyp#installation) dependencies properly

tsconfig.json

@@ -17,13 +17,5 @@
     "noUnusedLocals": true,
     "noUnusedParameters": false,
     "noImplicitReturns": true
-  },
+  }
-  "include":[
-    "app/**/*",
-    "typings.d.ts"
-  ],
-  "exclude":[
-    "node_modules",
-    "app/node_modules"
-  ]
 }