From 43dd67e1a7c1416fa7d1756539ce1a9efba97243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20R=C3=B8en?= Date: Sun, 2 Oct 2016 19:49:05 +0200 Subject: [PATCH] Check specific coffeescript path Instead of discarding all paths that contains `ember-cli-coffeescript`, we now look for the specific path of this package. I ran in to this when testing things in a folder called `ember-cli-coffeescript-test` and getting some unexpected results. --- lib/utilities/ancestral-blueprint.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/utilities/ancestral-blueprint.js b/lib/utilities/ancestral-blueprint.js index 168f3ae..f42a3d1 100644 --- a/lib/utilities/ancestral-blueprint.js +++ b/lib/utilities/ancestral-blueprint.js @@ -2,6 +2,7 @@ var Blueprint = require('ember-cli/lib/models/blueprint'); var path = require('path'); +var coffeeScriptPath = path.resolve(__dirname, '../..', 'blueprints'); /** Find the non-coffeescript version of the blueprint to bootstrap off @@ -10,7 +11,7 @@ module.exports = function(dasherizedName, project) { var projectPaths = project ? project.blueprintLookupPaths() : []; projectPaths = projectPaths.filter(function(p) { - return !p.match(/ember-cli-coffeescript/); + return p !== coffeeScriptPath; }); projectPaths = projectPaths.concat(legacyBlueprintsPath());