From 10ad48436b41659818b9bc033004c4bfb12c5f2b Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Wed, 19 Oct 2016 16:26:49 -0700 Subject: [PATCH] Account for 2.9.0 not including Glimmer 2. --- .../instance-initializers/browser/head.js | 0 .../instance-initializers/fastboot/head.js | 0 index.js | 6 ++++-- 3 files changed, 4 insertions(+), 2 deletions(-) rename {app-lt-2-9 => app-lt-2-10}/instance-initializers/browser/head.js (100%) rename {app-lt-2-9 => app-lt-2-10}/instance-initializers/fastboot/head.js (100%) diff --git a/app-lt-2-9/instance-initializers/browser/head.js b/app-lt-2-10/instance-initializers/browser/head.js similarity index 100% rename from app-lt-2-9/instance-initializers/browser/head.js rename to app-lt-2-10/instance-initializers/browser/head.js diff --git a/app-lt-2-9/instance-initializers/fastboot/head.js b/app-lt-2-10/instance-initializers/fastboot/head.js similarity index 100% rename from app-lt-2-9/instance-initializers/fastboot/head.js rename to app-lt-2-10/instance-initializers/fastboot/head.js diff --git a/index.js b/index.js index c92cc45..062408d 100644 --- a/index.js +++ b/index.js @@ -15,8 +15,10 @@ module.exports = { var trees = [defaultTree]; - if (emberVersion.lt('2.9.0-alpha.4')) { - trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-9'))); + // 2.9.0-beta.1 - 2.9.0-beta.5 used glimmer2 (but 2.9.0 did not) + // 2.10.0-beta.1+ includes glimmer2 + if ((emberVersion.gt('2.9.0-beta') && emberVersion.lt('2.9.0')) || emberVersion.gt('2.10.0-beta')) { + trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-10'))); } var tree = mergeTrees(trees, { overwrite: true });