Convert to glimmer. Tests pass.

cibernox · cibernox · commit a3c456954366 · 2021-04-27T00:01:06.000+02:00
diff --git a/addon/components/head-layout.js b/addon/components/head-layout.js
@@ -1,37 +1,30 @@
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
-import layout from '../templates/components/head-layout';
 
-export default Component.extend({
-  tagName: '',
-  layout,
-  document: service('-document'),
+export default class HeadLayout extends Component {
+  @service('-document') document
 
   /**
    * If true, this will tear down any existing head on init of this component.
    * This is useful if there is a head built with fastboot - it will then be torn down when this is initialized in the browser.
    * If you do not want this behavior, you can set this to false.
    * @public
    */
-  shouldTearDownOnInit: true,
+  shouldTearDownOnInit = true
 
   /**
    * The element to render into. Defaults to <head> in `init`, overridable for our own tests only.
    * @private
    */
-  headElement: null,
+  headElement = this.args.headElement || this.document.head
 
-  init() {
-    this._super(...arguments);
+  constructor() {
+    super(...arguments);
 
-    if (this.get('headElement') === null) {
-      this.set('headElement', this.get('document.head'));
-    }
-
-    if (this.get('shouldTearDownOnInit')) {
+    if (this.shouldTearDownOnInit) {
       this._tearDownHead();
     }
-  },
+  }
 
   /**
    * Tear down any previous head, if there was one.
@@ -43,7 +36,7 @@ export default Component.extend({
     }
 
     // clear fast booted head (if any)
-    let document = this.get('document');
+    let document = this.document;
     let startMeta = document.querySelector('meta[name="ember-cli-head-start"]');
     let endMeta = document.querySelector('meta[name="ember-cli-head-end"]');
     if (startMeta && endMeta) {
@@ -55,10 +48,10 @@ export default Component.extend({
       document.head.removeChild(startMeta);
       document.head.removeChild(endMeta);
     }
-  },
+  }
 
   _isFastboot() {
     return typeof FastBoot !== 'undefined'
   }
 
-});
+}
diff --git a/addon/services/head-data.js b/addon/services/head-data.js
@@ -1,4 +1,4 @@
 import Service from '@ember/service';
 
-export default Service.extend({
-});
+export default class HeadData extends Service {
+}
diff --git a/addon/templates/components/head-layout.hbs b/addon/templates/components/head-layout.hbs
@@ -1,3 +1,3 @@
 {{#in-element this.headElement insertBefore=null}}
-  <meta name="ember-cli-head-start" content="">{{head-content}}<meta name="ember-cli-head-end" content="">
+  <meta name="ember-cli-head-start" content=""><HeadContent/><meta name="ember-cli-head-end" content="">
 {{/in-element}}
diff --git a/app/templates/components/head-layout.js b/app/templates/components/head-layout.js
@@ -0,0 +1 @@
+export { default } from 'ember-cli-head/templates/components/head-layout';
diff --git a/fastboot-tests/fixtures/fastboot/app/templates/application.hbs b/fastboot-tests/fixtures/fastboot/app/templates/application.hbs
@@ -1,2 +1,2 @@
-{{head-layout}}
+<HeadLayout/>
 {{outlet}}
diff --git a/fastboot-tests/fixtures/fastboot/app/templates/head.hbs b/fastboot-tests/fixtures/fastboot/app/templates/head.hbs
@@ -2,4 +2,4 @@
 <!-- here. The 'model' available in this template can be populated by-->
 <!-- setting values on the 'head-data' service. -->
 
-<meta property="og:title" content={{model.title}}>
+<meta property="og:title" content={{this.model.title}}>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,8 +48,8 @@
     "ember-auto-import": "^1.11.2",
     "ember-cli": "~3.26.1",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-fastboot": "^2.2.2",
-    "ember-cli-fastboot-testing": "^0.3.0",
+    "ember-cli-fastboot": "^2.2.3",
+    "ember-cli-fastboot-testing": "^0.5.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.1",
diff --git a/tests/dummy/app/templates/head.hbs b/tests/dummy/app/templates/head.hbs
@@ -2,4 +2,4 @@
 <!-- here. The 'model' available in this template can be populated by-->
 <!-- setting values on the 'head-data' service. -->
 
-<meta property="og:title" content={{model.title}}>
+<meta property="og:title" content={{this.model.title}}>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { default } from 'ember-cli-head/templates/components/head-layout';`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-{{head-layout}}`
	`1`	`+<HeadLayout/>`
`2`	`2`	`{{outlet}}`