✨ Finalised new boot process

- This commit removes the old boot process and any files that are no longer needed as a result
- Remove the duplicate event for triggering inactive themes to load
- Tidied up a few other bits

Author: ErisDS

core/boot.js

@@ -208,7 +208,6 @@ async function bootGhost() {
         debug('End: Load sentry');
 
         debug('Begin: load server + minimal app');
-        process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
         // Get minimal application in maintenance mode
         const rootApp = require('./app');
@@ -241,7 +240,7 @@ async function bootGhost() {
         mountGhost(rootApp, ghostApp);
 
         // Announce Server Readiness
-        logging.info('Ghost boot', (Date.now() - startTime) / 1000 + 's');
+        logging.info('Ghost booted', (Date.now() - startTime) / 1000 + 's');
         debug('boot announcing readiness');
         GhostServer.announceServerReadiness();
 

core/frontend/services/themes/index.js

@@ -23,11 +23,8 @@ module.exports = {
 
         debug('init themes', activeThemeName);
 
-        // Register a listener for server-start to load all themes
-        events.on('server.start', function readAllThemesOnServerStart() {
-            themeLoader.loadAllThemes();
-        });
-        events.on('themes.ready', function readAllThemesOnServerStart() {
+        // Register a listener for when the server says we can start to load all themes
+        events.on('themes.ready', function readAllThemesOnReady() {
             themeLoader.loadAllThemes();
         });
 

core/index.js

@@ -199,15 +199,6 @@ class GhostServer {
         }
     }
 
-    /**
-    * @param  {Object} externalApp - express app instance
-    * @return {Promise} Resolves once Ghost has switched HTTP Servers
-    */
-    async swapHttpApp(externalApp) {
-        await this._stopServer();
-        await this.start(externalApp);
-    }
-
     /**
      * ### Hammertime
      * To be called after `stop`

core/server/data/db/migrator.js

@@ -1,14 +1,19 @@
-const argv = process.argv;
+/**
+ * Internal CLI Placeholder
+ *
+ * If we want to add alternative commands, flags, or modify environment vars, it should all go here.
+ * Important: This file should not contain any requires, unless we decide to add pretty-cli/commander type tools
+ *
+ **/
+
+// Don't allow NODE_ENV to be null
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const mode = argv[2] || 'new';
+const argv = process.argv;
+const mode = argv[2];
 
 // Switch between boot modes
 switch (mode) {
-case 'old':
-case '3':
-    // Old boot sequence
-    require('./startup');
-    break;
 default:
     // New boot sequence
     require('./core/boot')();

core/server/ghost-server.js

@@ -56,7 +56,6 @@
     "@tryghost/kg-markdown-html-renderer": "4.0.0-rc.2",
     "@tryghost/kg-mobiledoc-html-renderer": "4.0.0-rc.1",
     "@tryghost/magic-link": "0.6.6",
-    "@tryghost/maintenance": "0.1.0",
     "@tryghost/members-api": "1.0.0-rc.3",
     "@tryghost/members-csv": "0.4.4",
     "@tryghost/members-ssr": "0.8.10",