Merge pull request #546 from ef4/simplify-asset-rev

Disentangle from broccoli-asset-rev

Author: ef4

index.js

@@ -12,6 +12,7 @@ const chalk = require('chalk');
 const fastbootAppModule = require('./lib/utilities/fastboot-app-module');
 const FastBootConfig = require('./lib/broccoli/fastboot-config');
 const migrateInitializers = require('./lib/build-utilities/migrate-initializers');
+const SilentError = require('silent-error');
 
 const Concat = require('broccoli-concat');
 const Funnel = require('broccoli-funnel');
@@ -48,17 +49,18 @@ module.exports = {
    * See: https://ember-cli.com/user-guide/#integration
    */
   included(app) {
+
+    let assetRev = this.project.addons.find(addon => addon.name === 'broccoli-asset-rev');
+    if(assetRev && !assetRev.supportsFastboot) {
+      throw new SilentError("This version of ember-cli-fastboot requires a newer version of broccoli-asset-rev");
+    }
+
     // set autoRun to false since we will conditionally include creating app when app files
     // is eval'd in app-boot
     app.options.autoRun = false;
 
-    if (app.options.fingerprint) {
-      // set generateAssetMap to be true so that manifest files can be correctly written
-      // in package.json
-      app.options.fingerprint.generateAssetMap = true;
-    }
-
     app.import('vendor/experimental-render-mode-rehydrate.js');
+
     // get the app registry object and app name so that we can build the fastboot
     // tree
     this._appRegistry = app.registry;
@@ -285,7 +287,6 @@ module.exports = {
     let fastbootAppConfig = appConfig.fastboot;
 
     return new FastBootConfig(tree, {
-      assetMapPath: this.assetMapPath,
       project: this.project,
       name: this.app.name,
       outputPaths: this.app.options.outputPaths,

lib/broccoli/fastboot-config.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 'use strict';
 
 const fs     = require('fs');
@@ -7,7 +8,6 @@ const merge  = require('ember-cli-lodash-subset').merge;
 const md5Hex = require('md5-hex');
 const path   = require('path');
 const Plugin = require('broccoli-plugin');
-const SilentError = require('silent-error');
 
 const stringify = require('json-stable-stringify');
 
@@ -23,7 +23,6 @@ module.exports = class FastBootConfig extends Plugin {
     this.project = options.project;
 
     this.name = options.name;
-    this.assetMapEnabled = options.assetMapEnabled;
     this.ui = options.ui;
     this.fastbootAppConfig = options.fastbootAppConfig;
     this.outputPaths = options.outputPaths;
@@ -39,22 +38,6 @@ module.exports = class FastBootConfig extends Plugin {
       this.htmlFile = 'index.html';
     }
 
-    let defaultAssetMapPath = 'assets/assetMap.json';
-    let assetRev = this.project.addons.find(addon => addon.name === 'broccoli-asset-rev');
-
-    if (assetRev && assetRev.options) {
-      this.assetMapEnabled = !!(assetRev.options.enabled && assetRev.options.generateAssetMap);
-
-      if (assetRev.options.assetMapPath) {
-        this.assetMapPath = assetRev.options.assetMapPath;
-      }
-
-      if (assetRev.options.fingerprintAssetMap) {
-        defaultAssetMapPath = 'assets/assetMap-*.json'
-      }
-    }
-
-    this.assetMapPath = this.assetMapPath || options.assetMapPath || defaultAssetMapPath;
   }
 
 
@@ -145,19 +128,6 @@ module.exports = class FastBootConfig extends Plugin {
     this.moduleWhitelist = uniq(moduleWhitelist);
   }
 
-  readAssetManifest() {
-    let assetMapPath = path.join(this.inputPaths[0], this.assetMapPath);
-
-    try {
-      let assetMap = JSON.parse(fs.readFileSync(assetMapPath));
-      return assetMap;
-    } catch (e) {
-      if (this.assetMapEnabled) {
-        throw new SilentError("assetMap.json not found at: %s. Make sure `generateAssetMap` is set to true", assetMapPath);
-      }
-    }
-  }
-
   updateFastBootManifest(manifest) {
     this.project.addons.forEach(addon =>{
       if (addon.updateFastBootManifest) {
@@ -187,21 +157,7 @@ module.exports = class FastBootConfig extends Plugin {
       htmlFile: this.htmlFile
     };
 
-    manifest = this.updateFastBootManifest(manifest);
-
-    let rewrittenAssets = this.readAssetManifest();
-
-    if (rewrittenAssets) {
-      // update the vendor file with the fingerprinted file
-      let rewrittenVendorFiles = manifest['vendorFiles'].map(file => rewrittenAssets.assets[file] || file);
-      manifest['vendorFiles'] = rewrittenVendorFiles;
-
-      // update the app files array with fingerprinted files
-      let rewrittenAppFiles = manifest['appFiles'].map(file => rewrittenAssets.assets[file] || file);
-      manifest['appFiles'] = rewrittenAppFiles;
-    }
-
-    this.manifest = manifest;
+    this.manifest = this.updateFastBootManifest(manifest);
   }
 
   buildHostWhitelist() {

package.json

@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "body-parser": "^1.18.1",
-    "broccoli-asset-rev": "^2.4.5",
+    "broccoli-asset-rev": "^2.7.0",
     "broccoli-test-helper": "^1.1.0",
     "chai": "^4.1.0",
     "chai-fs": "^2.0.0",
@@ -77,9 +77,6 @@
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",
-    "after": [
-      "broccoli-asset-rev"
-    ],
     "before": [
       "broccoli-serve-files"
     ]