Merge pull request #585 from iezer/isaac/module-unification

Support module unification app in `/src/main`

Author: rwjblue

index.js

@@ -92,7 +92,8 @@ module.exports = {
     }
 
     if (type === 'app-boot') {
-      return fastbootAppModule(config.modulePrefix, JSON.stringify(config.APP || {}));
+      const isModuleUnification = (typeof this.project.isModuleUnification === 'function') && this.project.isModuleUnification();
+      return fastbootAppModule(config.modulePrefix, JSON.stringify(config.APP || {}), isModuleUnification);
     }
 
     // if the fastboot addon is installed, we overwrite the config-module so that the config can be read

lib/utilities/fastboot-app-module.js

@@ -7,16 +7,17 @@
 // The module defined here is prefixed with a `~` to make it less
 // likely to collide with user code, since it is not possible to
 // define a module with a name like this in the file system.
-module.exports = function fastbootAppModule(prefix, configAppAsString) {
+module.exports = function fastbootAppModule(prefix, configAppAsString, isModuleUnification) {
+  var appSuffix = isModuleUnification ? "src/main" : "app";
   return [
     "",
     "if (typeof FastBoot === 'undefined') {",
     "  if (!runningTests) {",
-    "    require('{{MODULE_PREFIX}}/app')['default'].create({{CONFIG_APP}});",
+    "    require('{{MODULE_PREFIX}}/" + appSuffix + "')['default'].create({{CONFIG_APP}});",
     "  }",
     "}",
     "",
-    "define('~fastboot/app-factory', ['{{MODULE_PREFIX}}/app', '{{MODULE_PREFIX}}/config/environment'], function(App, config) {",
+    "define('~fastboot/app-factory', ['{{MODULE_PREFIX}}/" + appSuffix + "', '{{MODULE_PREFIX}}/config/environment'], function(App, config) {",
     "  App = App['default'];",
     "  config = config['default'];",
     "",

package.json

@@ -60,7 +60,7 @@
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
-    "ember-resolver": "^4.3.0",
+    "ember-resolver": "^4.5.4",
     "ember-sinon": "^1.0.0",
     "ember-source": "~3.0.0",
     "eslint-plugin-ember": "^5.0.0",

yarn.lock

@@ -2355,9 +2355,9 @@ ember-qunit@^3.3.0:
     ember-cli-test-loader "^2.2.0"
     qunit "^2.5.0"
 
-ember-resolver@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.5.0.tgz#9248bf534dfc197fafe3118fff538d436078bf99"
+ember-resolver@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.5.4.tgz#39c06599b6859d6b476fb24ab31d850f2d1a74af"
   dependencies:
     "@glimmer/resolver" "^0.4.1"
     babel-plugin-debug-macros "^0.1.10"