Merge pull request #227 from xg-wang/require

Restore allowing fallback require from working directory

Author: kratiahuja

README.md

@@ -63,14 +63,22 @@ build command:
 $ ember build --environment production
 ```
 
-(You will need to have already set up the Ember CLI FastBoot addon. For
-more information, see the [FastBoot quickstart][quickstart].)
+(You will need to have already set up the [ember-cli-fastboot](https://github.com/ember-fastboot/ember-cli-fastboot) addon.
+For more information, see the [FastBoot quickstart][quickstart].)
 
 [quickstart]: https://www.ember-fastboot.com/quickstart
 
 Once this is done, you will have a `dist` directory that contains the
-multi-environment build of your app. Upload this file to your FastBoot
-server.
+multi-environment build of your app.
+
+Run the command to install run time node modules:
+
+```sh
+$ cd dist/
+$ npm install
+```
+
+Upload the `dist/` folder including `node_modules` to your FastBoot server.
 
 ### Command Line
 

src/ember-app.js

@@ -136,8 +136,16 @@ class EmberApp {
       let isWhitelisted = whitelist.indexOf(packageName) > -1;
 
       if (isWhitelisted) {
-        let resolvedModulePath = resolve.sync(moduleName, { basedir: distPath });
-        return require(resolvedModulePath);
+        try {
+          let resolvedModulePath = resolve.sync(moduleName, { basedir: distPath });
+          return require(resolvedModulePath);
+        } catch (error) {
+          if (error.code === 'MODULE_NOT_FOUND') {
+            return require(moduleName);
+          } else {
+            throw error;
+          }
+        }
       }
 
       if (isLegacyWhitelist) {
@@ -147,7 +155,6 @@ class EmberApp {
           if (fs.existsSync(nodeModulesPath)) {
             return require(nodeModulesPath);
           } else {
-            // If it's not on disk, assume it's a built-in node package
             return require(moduleName);
           }
         } else {
@@ -390,7 +397,6 @@ class EmberApp {
     // set schema version to 1 if not defined
     schemaVersion = schemaVersion || FastBootSchemaVersions.base;
     debug('Current schemaVersion from `ember-cli-fastboot` is %s while latest schema version is %s', schemaVersion, currentSchemaVersion);
-  
     if (schemaVersion > currentSchemaVersion) {
       let errorMsg = chalk.bold.red('An incompatible version between `ember-cli-fastboot` and `fastboot` was found. Please update the version of fastboot library that is compatible with ember-cli-fastboot.');
       throw new Error(errorMsg);