Merge branch 'v7' of https://github.com/Financial-Times/n-ui into v7

* 'v7' of https://github.com/Financial-Times/n-ui:
  no more circular mindfuck (#1107)

browser/bundles/main.js

@@ -16,11 +16,8 @@ import { AppInitializer } from '../js/app-initializer';
 
 // returns {flags, allStylesLoaded, appInfo}
 const app = new AppInitializer();
-app.bootstrap(window.FT.nUiConfig || {
-	preset: 'discrete'
-});
 
-window.FT.nUi = Object.assign(app.env, {
+window.FT.nUi = Object.assign({}, app.env, {
 	onAppInitialized: app.onAppInitialized,
 	ads: ads,
 	tracking: tracking,
@@ -35,3 +32,10 @@ window.FT.nUi = Object.assign(app.env, {
 		superstoreSync
 	}
 });
+
+// must be after the definition of window.ft.Nui as some subcomponents will
+// depend on it
+// TODO - see if webpack 3's dynamic imports can replace the above hack
+app.bootstrap(window.FT.nUiConfig || {
+	preset: 'discrete'
+});