Make node statics configurable

config/default-disco.js

@@ -6,7 +6,6 @@ const amoCDN = 'https://addons.cdn.mozilla.net';
 const staticHost = 'https://addons-discovery.cdn.mozilla.net';
 
 module.exports = {
-
   // The keys listed here will be exposed on the client.
   // Since by definition client-side code is public these config keys
   // must not contain sensitive data.

config/default.js

@@ -40,6 +40,9 @@ module.exports = {
 
   enableClientConsole: false,
 
+  // If true node will serve the static files.
+  enableNodeStatics: false,
+
   isDeployed: true,
   isDevelopment: false,
 

src/core/server/base.js

@@ -61,7 +61,9 @@ function baseServer(routes, createStore, { appInstanceName = appName } = {}) {
   // CSP configuration.
   app.use(helmet.contentSecurityPolicy(config.get('CSP')));
 
-  app.use(Express.static(path.join(config.get('basePath'), 'dist')));
+  if (config.get('enableNodeStatics')) {
+    app.use(Express.static(path.join(config.get('basePath'), 'dist')));
+  }
 
   // Return version information as json
   app.get('/__version__', (req, res) => {

tests/server/TestConfig.js

@@ -6,20 +6,35 @@ import config from 'config';
 const appsList = config.get('validAppNames');
 
 
-describe('Config', () => {
-  afterEach(() => {
-    process.env.NODE_ENV = 'production';
-    delete process.env.NODE_APP_INSTANCE;
-  });
+for (const appName of appsList) {
+  describe(`Config for ${appName}`, () => {
+    let oldNodeEnv;
+
+    before(() => {
+      oldNodeEnv = process.env.NODE_APP_INSTANCE;
+    });
+
+    beforeEach(() => {
+      process.env.NODE_APP_INSTANCE = appName;
+      process.env.NODE_ENV = 'production';
+    });
+
+    afterEach(() => {
+      process.env.NODE_ENV = oldNodeEnv;
+      delete process.env.NODE_APP_INSTANCE;
+    });
+
+    it(`should not ever have enableNodeStatics set to true for ${appName}`, () => {
+      const conf = requireUncached('config');
+      assert.equal(conf.get('enableNodeStatics'), false);
+    });
 
-  for (const appName of appsList) {
     it(`should not ever have disableSSR set to true for ${appName}`, () => {
       const conf = requireUncached('config');
       assert.equal(conf.get('disableSSR'), false);
     });
 
     it(`should provide a production conf by default for ${appName}`, () => {
-      process.env.NODE_ENV = 'production';
       const conf = requireUncached('config');
       const clientConfig = getClientConfig(conf);
       assert.equal(conf.get('apiHost'), 'https://addons.mozilla.org');
@@ -53,8 +68,8 @@ describe('Config', () => {
       assert.equal(clientConfig.apiHost, 'https://addons-dev.allizom.org');
       assert.equal(conf.util.getEnv('NODE_ENV'), 'development');
     });
-  }
-});
+  });
+}
 
 
 describe('Config Environment Variables', () => {