co-locate templates

GavinJoyce · Jul 19, 2019 · 7834650 · 7834650
1 parent bb87fb8
commit 7834650
Show file tree

Hide file tree

Showing 12 changed files with 205 additions and 121 deletions.
diff --git a/app/components/.gitkeep b/app/components/.gitkeep
diff --git a/...s/components/nested1/nested-component.hbs → app/components/nested1/nested-component.hbs b/...s/components/nested1/nested-component.hbs → app/components/nested1/nested-component.hbs
diff --git a/...ested1/nested2/super-nested-component.hbs → ...ested1/nested2/super-nested-component.hbs b/...ested1/nested2/super-nested-component.hbs → ...ested1/nested2/super-nested-component.hbs
diff --git a/app/components/nested1/nested2/template-only-component.hbs b/app/components/nested1/nested2/template-only-component.hbs
@@ -0,0 +1 @@
+<h2>[template-only-component]</h2> 
diff --git a/...plates/components/top-level-component.hbs → app/components/top-level-component.hbs b/...plates/components/top-level-component.hbs → app/components/top-level-component.hbs
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -6,4 +6,4 @@
 
 <Nested1::Nested2::SuperNestedComponent />
 
-<Nested1::Nested2::TemplateOnlyComponent />
+{{!-- <Nested1::Nested2::TemplateOnlyComponent /> --}}
diff --git a/app/templates/components/.gitkeep b/app/templates/components/.gitkeep
diff --git a/app/templates/components/nested1/nested2/template-only-component.hbs b/app/templates/components/nested1/nested2/template-only-component.hbs
diff --git a/config/environment.js b/config/environment.js
@@ -10,6 +10,7 @@ module.exports = function(environment) {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
+        EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true        
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.

diff --git a/config/optional-features.json b/config/optional-features.json
@@ -1,3 +1,4 @@
 {
-  "jquery-integration": true
+  "jquery-integration": true,
+  "template-only-glimmer-components": true
 }
diff --git a/package.json b/package.json
@@ -22,12 +22,12 @@
     "@ember/optional-features": "^0.7.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-ajax": "^5.0.0",
-    "ember-cli": "~3.11.0",
+    "ember-cli": "github:ember-cli/ember-cli#977afe0dc160bc91d67d42825638af5dd796d4a4",
     "ember-cli-app-version": "^3.2.0",
     "ember-cli-babel": "^7.7.3",
     "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-htmlbars": "github:ember-cli/ember-cli-htmlbars#colocation",
     "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-inject-live-reload": "^1.8.2",
     "ember-cli-sri": "^2.1.1",
@@ -39,7 +39,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^4.4.1",
     "ember-resolver": "^5.0.1",
-    "ember-source": "~3.11.1",
+    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/9951eea116491f5878eef2211b5b95625261e444.tgz",
     "ember-welcome-page": "^4.0.0",
     "eslint-plugin-ember": "^6.2.0",
     "eslint-plugin-node": "^9.0.1",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@

		<Nested1::Nested2::SuperNestedComponent />

		<Nested1::Nested2::TemplateOnlyComponent />
		{{!-- <Nested1::Nested2::TemplateOnlyComponent /> --}}