From 86ffb95dc86c77454e2713715427d1d854212ec9 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Sat, 19 Mar 2016 16:24:28 -0400 Subject: [PATCH] Move templates into ember-glimmer. Updates to emberjs-build allow package specific precompiler to work properly. This takes advantage of that by symlinking shared templates from ember-glimmer to ember-htmlbars packages (so the template contents can be shared). --- lib/packages.js | 3 ++- packages/ember-glimmer/lib/templates/component.hbs | 1 + packages/ember-glimmer/lib/templates/empty.hbs | 0 packages/ember-glimmer/lib/templates/link-to.hbs | 1 + packages/ember-glimmer/lib/templates/top-level-view.hbs | 1 + packages/ember-htmlbars/lib/templates/component.hbs | 2 +- packages/ember-htmlbars/lib/templates/empty.hbs | 1 + packages/ember-htmlbars/lib/templates/link-to.hbs | 2 +- packages/ember-htmlbars/lib/templates/top-level-view.hbs | 2 +- 9 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 packages/ember-glimmer/lib/templates/component.hbs create mode 100644 packages/ember-glimmer/lib/templates/empty.hbs create mode 100644 packages/ember-glimmer/lib/templates/link-to.hbs create mode 100644 packages/ember-glimmer/lib/templates/top-level-view.hbs mode change 100644 => 120000 packages/ember-htmlbars/lib/templates/component.hbs mode change 100644 => 120000 packages/ember-htmlbars/lib/templates/empty.hbs mode change 100644 => 120000 packages/ember-htmlbars/lib/templates/link-to.hbs mode change 100644 => 120000 packages/ember-htmlbars/lib/templates/top-level-view.hbs diff --git a/lib/packages.js b/lib/packages.js index 38112e667b8..bf4a6594499 100644 --- a/lib/packages.js +++ b/lib/packages.js @@ -36,7 +36,8 @@ if (glimmerStatus === null || glimmerStatus === true) { testingVendorRequirements: [ 'glimmer-object', 'glimmer-engine-tests' - ] + ], + hasTemplates: true }; var templateCompiler = packages['ember-template-compiler']; diff --git a/packages/ember-glimmer/lib/templates/component.hbs b/packages/ember-glimmer/lib/templates/component.hbs new file mode 100644 index 00000000000..fb5c4b157d1 --- /dev/null +++ b/packages/ember-glimmer/lib/templates/component.hbs @@ -0,0 +1 @@ +{{yield}} \ No newline at end of file diff --git a/packages/ember-glimmer/lib/templates/empty.hbs b/packages/ember-glimmer/lib/templates/empty.hbs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/ember-glimmer/lib/templates/link-to.hbs b/packages/ember-glimmer/lib/templates/link-to.hbs new file mode 100644 index 00000000000..5f543159a3f --- /dev/null +++ b/packages/ember-glimmer/lib/templates/link-to.hbs @@ -0,0 +1 @@ +{{#if linkTitle}}{{linkTitle}}{{else}}{{yield}}{{/if}} \ No newline at end of file diff --git a/packages/ember-glimmer/lib/templates/top-level-view.hbs b/packages/ember-glimmer/lib/templates/top-level-view.hbs new file mode 100644 index 00000000000..e2147cab02d --- /dev/null +++ b/packages/ember-glimmer/lib/templates/top-level-view.hbs @@ -0,0 +1 @@ +{{outlet}} \ No newline at end of file diff --git a/packages/ember-htmlbars/lib/templates/component.hbs b/packages/ember-htmlbars/lib/templates/component.hbs deleted file mode 100644 index fb5c4b157d1..00000000000 --- a/packages/ember-htmlbars/lib/templates/component.hbs +++ /dev/null @@ -1 +0,0 @@ -{{yield}} \ No newline at end of file diff --git a/packages/ember-htmlbars/lib/templates/component.hbs b/packages/ember-htmlbars/lib/templates/component.hbs new file mode 120000 index 00000000000..a0f765a933d --- /dev/null +++ b/packages/ember-htmlbars/lib/templates/component.hbs @@ -0,0 +1 @@ +../../../ember-glimmer/lib/templates/component.hbs \ No newline at end of file diff --git a/packages/ember-htmlbars/lib/templates/empty.hbs b/packages/ember-htmlbars/lib/templates/empty.hbs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/ember-htmlbars/lib/templates/empty.hbs b/packages/ember-htmlbars/lib/templates/empty.hbs new file mode 120000 index 00000000000..5cb3b0a3d2b --- /dev/null +++ b/packages/ember-htmlbars/lib/templates/empty.hbs @@ -0,0 +1 @@ +../../../ember-glimmer/lib/templates/empty.hbs \ No newline at end of file diff --git a/packages/ember-htmlbars/lib/templates/link-to.hbs b/packages/ember-htmlbars/lib/templates/link-to.hbs deleted file mode 100644 index 5f543159a3f..00000000000 --- a/packages/ember-htmlbars/lib/templates/link-to.hbs +++ /dev/null @@ -1 +0,0 @@ -{{#if linkTitle}}{{linkTitle}}{{else}}{{yield}}{{/if}} \ No newline at end of file diff --git a/packages/ember-htmlbars/lib/templates/link-to.hbs b/packages/ember-htmlbars/lib/templates/link-to.hbs new file mode 120000 index 00000000000..6c415031b45 --- /dev/null +++ b/packages/ember-htmlbars/lib/templates/link-to.hbs @@ -0,0 +1 @@ +../../../ember-glimmer/lib/templates/link-to.hbs \ No newline at end of file diff --git a/packages/ember-htmlbars/lib/templates/top-level-view.hbs b/packages/ember-htmlbars/lib/templates/top-level-view.hbs deleted file mode 100644 index e2147cab02d..00000000000 --- a/packages/ember-htmlbars/lib/templates/top-level-view.hbs +++ /dev/null @@ -1 +0,0 @@ -{{outlet}} \ No newline at end of file diff --git a/packages/ember-htmlbars/lib/templates/top-level-view.hbs b/packages/ember-htmlbars/lib/templates/top-level-view.hbs new file mode 120000 index 00000000000..33d9160e15b --- /dev/null +++ b/packages/ember-htmlbars/lib/templates/top-level-view.hbs @@ -0,0 +1 @@ +../../../ember-glimmer/lib/templates/top-level-view.hbs \ No newline at end of file