From ed831dacd09257ee682fcb73e044f69c16903ecd Mon Sep 17 00:00:00 2001
From: David Balatero <dbalatero@gmail.com>
Date: Wed, 21 Jun 2017 17:31:20 -0700
Subject: [PATCH] Refactor external source files to live in app/

---
 autoupdate.js => app/autoupdate.js     | 0
 locale.js => app/locale.js             | 9 ++++++++-
 menu.js => app/menu.js                 | 0
 window_state.js => app/window_state.js | 0
 main.js                                | 8 ++++----
 package.json                           | 5 +----
 6 files changed, 13 insertions(+), 9 deletions(-)
 rename autoupdate.js => app/autoupdate.js (100%)
 rename locale.js => app/locale.js (76%)
 rename menu.js => app/menu.js (100%)
 rename window_state.js => app/window_state.js (100%)

diff --git a/autoupdate.js b/app/autoupdate.js
similarity index 100%
rename from autoupdate.js
rename to app/autoupdate.js
diff --git a/locale.js b/app/locale.js
similarity index 76%
rename from locale.js
rename to app/locale.js
index 0d1d67dd77..3d4dc340a1 100644
--- a/locale.js
+++ b/app/locale.js
@@ -11,7 +11,14 @@ function normalizeLocaleName(locale) {
 
 function getLocaleMessages(locale) {
   const onDiskLocale = locale.replace('-', '_');
-  const targetFile = path.join(__dirname, '_locales', onDiskLocale, 'messages.json');
+
+  const targetFile = path.join(
+    __dirname,
+    '..',
+    '_locales',
+    onDiskLocale,
+    'messages.json'
+  );
 
   return JSON.parse(fs.readFileSync(targetFile, 'utf-8'))
 }
diff --git a/menu.js b/app/menu.js
similarity index 100%
rename from menu.js
rename to app/menu.js
diff --git a/window_state.js b/app/window_state.js
similarity index 100%
rename from window_state.js
rename to app/window_state.js
diff --git a/main.js b/main.js
index b5e640e3f5..788a32ddf5 100644
--- a/main.js
+++ b/main.js
@@ -9,9 +9,9 @@ const Menu = electron.Menu;
 const shell = electron.shell;
 const ElectronConfig = require('electron-config');
 
-const autoupdate = require('./autoupdate');
-const locale = require('./locale');
-const windowState = require('./window_state');
+const autoupdate = require('./app/autoupdate');
+const locale = require('./app/locale');
+const windowState = require('./app/window_state');
 
 console.log('setting AUMID');
 app.setAppUserModelId('org.whispersystems.signal-desktop')
@@ -213,7 +213,7 @@ app.on('ready', function() {
 
   createWindow();
 
-  let template = require('./menu.js');
+  let template = require('./app/menu.js');
   if (process.platform === 'darwin') {
     template[3].submenu[3].click = function() {
       mainWindow.show();
diff --git a/package.json b/package.json
index 8943896261..3d2e26eb25 100644
--- a/package.json
+++ b/package.json
@@ -109,12 +109,9 @@
       "stylesheets/*.css",
       "!js/register.js",
       "!js/views/standalone_registration_view.js",
+      "app/*",
       "preload.js",
-      "window_state.js",
-      "autoupdate.js",
-      "locale.js",
       "main.js",
-      "menu.js",
       "audio/**",
       "images/**",
       "fonts/*",