Skip to content

Commit

Permalink
Merge pull request #64 from eventualbuddha/minor-fixes
Browse files Browse the repository at this point in the history
Minor fixes
  • Loading branch information
rwjblue committed Jun 7, 2018
2 parents 3142fbc + 67d7ba9 commit ad0d518
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/asset-manifest-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ AssetManifestGenerator.prototype.build = function() {
var existingManifestPath = this.inputPaths[1];
var existingManifest;

// Check to see if we have an exisiting manifest. If not, than use a new
// Check to see if we have an existing manifest. If not, than use a new
// empty manifest.
try {
existingManifest = fs.readJsonSync(path.join(existingManifestPath, 'asset-manifest.json'))
Expand Down
3 changes: 0 additions & 3 deletions lib/manifest-generator.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
var path = require('path');
var fs = require('fs-extra');
var Addon = require('ember-cli/lib/models/addon');
var mergeTrees = require('broccoli-merge-trees');
var objectAssign = require('object-assign');
var findHost = require('./utils/find-host');

Expand Down
1 change: 0 additions & 1 deletion lib/node-asset-manifest-generator.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var Plugin = require('broccoli-caching-writer');
var walk = require('walk-sync');
var path = require('path');
var fs = require('fs-extra');

Expand Down
2 changes: 1 addition & 1 deletion lib/utils/find-host.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* up the parent/app hierarchy.
*
* @param {EmberAddon|EmberApp} context
* @return {EmberApp} app
* @return {EmberApp}
*/
module.exports = function findHost(context) {
var current = context;
Expand Down
2 changes: 0 additions & 2 deletions node-tests/asset-manifest-inserter-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,9 @@ describe('asset-manifest-inserter', function() {
var output = results.directory;
var indexFilePath = path.join(output, 'index.html');
var testIndexFilePath = path.join(output, 'tests', 'index.html');
var manifestFilePath = path.join(inputTrees[0], 'asset-manifest.json')

var index = fs.readFileSync(indexFilePath, { encoding: 'utf8' });
var testIndex = fs.readFileSync(testIndexFilePath, { encoding: 'utf8' });
var assetManifest = fs.readJsonSync(manifestFilePath);

var appNeedle = 'herp-de-derp';
assert.notEqual(index.indexOf(appNeedle), -1);
Expand Down

0 comments on commit ad0d518

Please sign in to comment.