Merge pull request #124 from ember-cli/upgrades

Bump deps

node-tests/template_compiler_test.js

@@ -33,9 +33,9 @@ describe('TemplateCompiler', function(){
     let tree = new TemplateCompiler(sourcePath, htmlbarsOptions);
 
     builder = new broccoli.Builder(tree);
-    let results = yield builder.build();
+    yield builder.build();
 
-    let actual = fs.readFileSync(results.directory + '/template.js', { encoding: 'utf8'});
+    let actual = fs.readFileSync(builder.outputPath + '/template.js', { encoding: 'utf8'});
     let source = fs.readFileSync(sourcePath + '/template.hbs', { encoding: 'utf8' });
     let expected = 'export default Ember.HTMLBars.template(' + htmlbarsPrecompile(source, { moduleName: 'template.hbs' }) + ');';
 
@@ -46,9 +46,9 @@ describe('TemplateCompiler', function(){
     let tree = new TemplateCompiler(sourcePath, htmlbarsOptions);
 
     builder = new broccoli.Builder(tree);
-    let results = yield builder.build();
+    yield builder.build();
 
-    let actual = fs.readFileSync(results.directory + '/template-with-bom.js', { encoding: 'utf8'});
+    let actual = fs.readFileSync(builder.outputPath + '/template-with-bom.js', { encoding: 'utf8'});
     let source = fs.readFileSync(sourcePath + '/template.hbs', { encoding: 'utf8' });
     let expected = 'export default Ember.HTMLBars.template(' + htmlbarsPrecompile(source, { moduleName: 'template-with-bom.hbs' }) + ');';
 
@@ -63,9 +63,9 @@ describe('TemplateCompiler', function(){
     let tree = new TemplateCompiler(sourcePath, htmlbarsOptions);
 
     builder = new broccoli.Builder(tree);
-    let results = yield builder.build();
+    yield builder.build();
 
-    let actual = fs.readFileSync(results.directory + '/web-component-template.js', { encoding: 'utf8'});
+    let actual = fs.readFileSync(builder.outputPath + '/web-component-template.js', { encoding: 'utf8'});
     let source = fs.readFileSync(sourcePath + '/web-component-template.hbs', { encoding: 'utf8' });
     let expected = 'export default Ember.HTMLBars.template(' + htmlbarsPrecompile(source, { moduleName: 'web-component-template.hbs' }) + ');';
 
@@ -82,9 +82,9 @@ describe('TemplateCompiler', function(){
     let tree = new TemplateCompiler(sourcePath, htmlbarsOptions);
 
     builder = new broccoli.Builder(tree);
-    let results = yield builder.build();
+    yield builder.build();
 
-    let actual = fs.readFileSync(results.directory + '/web-component-template.js', { encoding: 'utf8'});
+    let actual = fs.readFileSync(builder.outputPath + '/web-component-template.js', { encoding: 'utf8'});
     let source = fs.readFileSync(sourcePath + '/web-component-template.hbs', { encoding: 'utf8' });
     let expected = 'export default Ember.HTMLBars.template(' + htmlbarsPrecompile(source, { moduleName: 'web-component-template.hbs' }) + ');';
 

package.json

@@ -39,21 +39,21 @@
   },
   "homepage": "https://github.com/ember-cli/ember-cli-htmlbars",
   "devDependencies": {
-    "broccoli": "^0.16.7",
+    "broccoli": "^2.0.0-beta.4",
     "broccoli-concat": "^3.5.1",
     "co": "^4.6.0",
     "ember-cli": "~3.3.0",
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-babel": "^6.6.0",
-    "ember-cli-dependency-checker": "^2.0.0",
+    "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-eslint": "^4.2.1",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.3.2",
     "ember-cli-shims": "^1.2.0",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-resolver": "^4.0.0",
+    "ember-resolver": "^5.0.0",
     "ember-source": "~3.3.1",
     "ember-source-channel-url": "^1.1.0",
     "ember-try": "^0.2.23",
@@ -62,7 +62,7 @@
     "eslint-plugin-node": "^7.0.1",
     "loader.js": "^4.2.3",
     "mocha": "^5.2.0",
-    "qunit-dom": "^0.6.2"
+    "qunit-dom": "^0.7.1"
   },
   "dependencies": {
     "broccoli-persistent-filter": "^1.4.3",