ember-cli-htmlbars
Advanced tools
Comparing version 4.1.1 to 4.2.0
@@ -0,1 +1,9 @@ | ||
## v4.2.0 (2019-12-11) | ||
#### :rocket: Enhancement | ||
* [#384](https://github.com/ember-cli/ember-cli-htmlbars/pull/384) Remove `setEdition` requirement for colocation. ([@rwjblue](https://github.com/rwjblue)) | ||
#### Committers: 1 | ||
- Robert Jackson ([@rwjblue](https://github.com/rwjblue)) | ||
## v4.1.1 (2019-12-11) | ||
@@ -2,0 +10,0 @@ |
@@ -5,3 +5,2 @@ 'use strict'; | ||
const utils = require('./utils'); | ||
const hasEdition = require('@ember/edition-utils').has; | ||
@@ -34,2 +33,5 @@ let registryInvocationCounter = 0; | ||
let ember = this.project.addons.find(a => a.name === 'ember-source'); | ||
let emberVersion = ember !== undefined && ember.pkg.version; | ||
// using this.project.emberCLIVersion() allows us to avoid issues when `npm | ||
@@ -43,9 +45,12 @@ // link` is used; if this addon were linked and we did something like | ||
let hasValidEmberCLIVersion = semver.gte(emberCLIVersion, '3.12.0-beta.2'); | ||
let hasOctane = hasEdition('octane'); | ||
// once a polyfill is written, we will need to update this logic to check | ||
// for _either_ `ember-source@3.13` or the polyfill | ||
let hasValidEmberVersion = semver.gte(emberVersion, '3.13.0'); | ||
this._cachedShouldColocateTemplates = | ||
hasOctane && hasValidBabelVersion && hasValidEmberCLIVersion; | ||
hasValidEmberVersion && hasValidBabelVersion && hasValidEmberCLIVersion; | ||
this.logger.info( | ||
`Colocation processing: ${this._cachedShouldColocateTemplates} (hasOctane: ${hasOctane}; hasValidEmberCLIVersion: ${hasValidEmberCLIVersion}; hasValidBabelVersion: ${hasValidBabelVersion};` | ||
`Colocation processing: ${this._cachedShouldColocateTemplates} (hasValidEmberVersion: ${hasValidEmberVersion} hasValidEmberCLIVersion: ${hasValidEmberCLIVersion}; hasValidBabelVersion: ${hasValidBabelVersion};` | ||
); | ||
@@ -52,0 +57,0 @@ |
{ | ||
"name": "ember-cli-htmlbars", | ||
"version": "4.1.1", | ||
"version": "4.2.0", | ||
"description": "A library for adding htmlbars to ember CLI", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
49920
876