Merge pull request emberjs#13133 from rwjblue/use-package-specific-te…

…mplate-precompiler Move templates into ember-glimmer.
tildeio · Mar 19, 2016 · a564a3f · a564a3f
2 parents afc5c54 + b0d6a30
commit a564a3f
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 5 deletions.
diff --git 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/package.json b/package.json
@@ -34,7 +34,7 @@
     "ember-cli-sauce": "^1.4.2",
     "ember-cli-yuidoc": "0.8.3",
     "ember-publisher": "0.0.7",
-    "emberjs-build": "0.6.2",
+    "emberjs-build": "0.6.3",
     "express": "^4.5.0",
     "finalhandler": "^0.4.0",
     "github": "^0.2.3",

diff --git a/packages/ember-glimmer/lib/templates/component.hbs b/packages/ember-glimmer/lib/templates/component.hbs
@@ -0,0 +1 @@
+{{yield}}
diff --git a/packages/ember-glimmer/lib/templates/empty.hbs b/packages/ember-glimmer/lib/templates/empty.hbs
diff --git a/packages/ember-glimmer/lib/templates/link-to.hbs b/packages/ember-glimmer/lib/templates/link-to.hbs
@@ -0,0 +1 @@
+{{#if linkTitle}}{{linkTitle}}{{else}}{{yield}}{{/if}}
diff --git a/packages/ember-glimmer/lib/templates/top-level-view.hbs b/packages/ember-glimmer/lib/templates/top-level-view.hbs
@@ -0,0 +1 @@
+{{outlet}}
diff --git a/packages/ember-htmlbars/lib/templates/component.hbs b/packages/ember-htmlbars/lib/templates/component.hbs
diff --git a/packages/ember-htmlbars/lib/templates/component.hbs b/packages/ember-htmlbars/lib/templates/component.hbs
@@ -0,0 +1 @@
+../../../ember-glimmer/lib/templates/component.hbs
diff --git a/packages/ember-htmlbars/lib/templates/empty.hbs b/packages/ember-htmlbars/lib/templates/empty.hbs
diff --git a/packages/ember-htmlbars/lib/templates/empty.hbs b/packages/ember-htmlbars/lib/templates/empty.hbs
@@ -0,0 +1 @@
+../../../ember-glimmer/lib/templates/empty.hbs
diff --git a/packages/ember-htmlbars/lib/templates/link-to.hbs b/packages/ember-htmlbars/lib/templates/link-to.hbs
diff --git a/packages/ember-htmlbars/lib/templates/link-to.hbs b/packages/ember-htmlbars/lib/templates/link-to.hbs
@@ -0,0 +1 @@
+../../../ember-glimmer/lib/templates/link-to.hbs
diff --git a/packages/ember-htmlbars/lib/templates/top-level-view.hbs b/packages/ember-htmlbars/lib/templates/top-level-view.hbs
diff --git a/packages/ember-htmlbars/lib/templates/top-level-view.hbs b/packages/ember-htmlbars/lib/templates/top-level-view.hbs
@@ -0,0 +1 @@
+../../../ember-glimmer/lib/templates/top-level-view.hbs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{{#if linkTitle}}{{linkTitle}}{{else}}{{yield}}{{/if}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../ember-glimmer/lib/templates/component.hbs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../ember-glimmer/lib/templates/link-to.hbs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../ember-glimmer/lib/templates/top-level-view.hbs