Make manifest in package.json respect outputPaths configuration in EmberApp; fixes #538

Author: Sergey Astapov

index.js

@@ -166,9 +166,13 @@ module.exports = {
       registry: this._appRegistry
     });
 
-    let fileAppName = path.basename(this.app.options.outputPaths.app.js).split('.')[0];
+    function stripLeadingSlash(filePath) {
+      return filePath.replace(/^\//, '');
+    }
+
+    let appFilePath = stripLeadingSlash(this.app.options.outputPaths.app.js);
     let finalFastbootTree = new Concat(processExtraTree, {
-      outputFile: 'assets/' + fileAppName + '-fastboot.js'
+      outputFile: appFilePath.replace(/\.js$/, '-fastboot.js')
     });
 
     return finalFastbootTree;
@@ -206,8 +210,8 @@ module.exports = {
   /**
    * Need to handroll our own clone algorithm since JSON.stringy changes regex
    * to empty objects which breaks hostWhiteList property of fastboot.
-   * 
-   * @param {Object} config 
+   *
+   * @param {Object} config
    */
   _cloneConfigObject(config) {
     if (config === null || typeof config !== 'object') {

lib/broccoli/fastboot-config.js

@@ -174,10 +174,13 @@ module.exports = class FastBootConfig extends Plugin {
   }
 
   buildManifest() {
-    let appFilePath = 'assets/' + path.basename(this.outputPaths.app.js);
-    let appFileName = appFilePath.split('.')[0];
-    let appFastbootFilePath = appFileName + '-fastboot.js';
-    let vendorFilePath = 'assets/' + path.basename(this.outputPaths.vendor.js);
+    function stripLeadingSlash(filePath) {
+      return filePath.replace(/^\//, '');
+    }
+
+    let appFilePath = stripLeadingSlash(this.outputPaths.app.js);
+    let appFastbootFilePath = appFilePath.replace(/\.js$/, '') + '-fastboot.js';
+    let vendorFilePath = stripLeadingSlash(this.outputPaths.vendor.js);
 
     let manifest = {
       appFiles: [appFilePath, appFastbootFilePath],
@@ -197,7 +200,6 @@ module.exports = class FastBootConfig extends Plugin {
       // update the app files array with fingerprinted files
       let rewrittenAppFiles = manifest['appFiles'].map(file => rewrittenAssets.assets[file] || file);
       manifest['appFiles'] = rewrittenAppFiles;
-
     }
 
     this.manifest = manifest;
@@ -265,12 +267,3 @@ function getDependencyVersion(pkg, dep) {
 
   return pkg.dependencies[dep];
 }
-
-function assetToFastboot(key) {
-  let parts = key.split('/');
-  let dir = parts[0];
-  if (dir === 'assets') {
-    parts[0] = 'fastboot';
-  }
-  return parts.join('/');
-}

test/fixtures/customized-outputpaths/ember-cli-build.js

@@ -8,12 +8,12 @@ module.exports = function(defaults) {
       app: {
         html: 'index.html',
         css: {
-          'app': '/assets/app.css',
+          'app': '/some-assets/path/app.css',
         },
-        js: '/assets/app.js'
+        js: '/some-assets/path/app-file.js'
       },
       vendor: {
-        js: '/assets/lib.js'
+        js: '/some-assets/path/lib.js'
       }
     }
   });

test/package-json-test.js

@@ -237,10 +237,13 @@ describe('generating package.json', function() {
       let pkg = fs.readJsonSync(customApp.filePath('/dist/package.json'));
       let manifest = pkg.fastboot.manifest;
 
+      expect(manifest.appFiles).to.include('some-assets/path/app-file.js');
       manifest.appFiles.forEach(function(file) {
         expect(p(file)).to.be.a.file();
       });
       expect(p(manifest.htmlFile)).to.be.a.file();
+
+      expect(manifest.vendorFiles).to.include('some-assets/path/lib.js');
       manifest.vendorFiles.forEach(function(file) {
         expect(p(file)).to.be.a.file();
       });