Merge pull request #73 from chancancode/upgrades

Author: rwjblue

.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

.eslintrc.js

@@ -1,8 +1,14 @@
+'use strict';
+
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
-    ecmaVersion: 2017,
-    sourceType: 'module'
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
   },
   plugins: [
     'ember'
@@ -15,6 +21,7 @@ module.exports = {
     browser: true
   },
   rules: {
+    'ember/no-jquery': 'error'
   },
   overrides: [
     // node files
@@ -36,8 +43,7 @@ module.exports = {
         'tests/dummy/app/**'
       ],
       parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
+        sourceType: 'script'
       },
       env: {
         browser: false,

.github/workflows/build.yml

@@ -0,0 +1,58 @@
+name: Build
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+    tags:
+      - v*
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  test:
+    name: Test (${{ matrix.scenario }})
+    runs-on: ubuntu-latest
+    env:
+      CI: 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        scenario:
+          - default
+          - default-with-lockfile
+          - default-with-jquery
+          - release
+          - beta
+          - canary
+          - lts-3.16
+          - lts-3.12
+          - lts-3.8
+          - lts-3.4
+          - lts-2.18
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Set up Volta
+        uses: volta-cli/action@v1
+      - name: Install dependencies (yarn)
+        if: matrix.scenario == 'default-with-lockfile'
+        run: yarn install --non-interactive --frozen-lockfile
+      - name: Install dependencies (yarn)
+        if: matrix.scenario != 'default-with-lockfile'
+        run: yarn install --non-interactive --no-lockfile
+      - name: Setup ember-try scenario
+        if: matrix.scenario != 'default' && matrix.scenario != 'default-with-lockfile'
+        run: >-
+          yarn ember try:one ember-${{ matrix.scenario }} --skip-cleanup ---
+          '[ -z "$EMBER_OPTIONAL_FEATURES" ] || echo "::set-env name=EMBER_OPTIONAL_FEATURES::$EMBER_OPTIONAL_FEATURES"'
+      - name: Lint (hbs)
+        run: yarn lint:hbs
+      - name: Lint (js)
+        run: yarn lint:js
+      - name: Build
+        run: yarn ember build --environment test
+      - name: Run test
+        # Due to a bug in ember-cli, running `ember test` with `--path` doesn't set `EMBER_ENV=test`
+        # See https://github.com/ember-cli/ember-cli/issues/8922
+        run: EMBER_ENV=test yarn test --path dist

.gitignore

@@ -10,6 +10,7 @@
 
 # misc
 /.env*
+/.pnp*
 /.sass-cache
 /connect.lock
 /coverage/

.npmignore

@@ -12,6 +12,7 @@
 /.env*
 /.eslintignore
 /.eslintrc.js
+/.git/
 /.gitignore
 /.template-lintrc.js
 /.travis.yml

.travis.yml

@@ -23,4 +23,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# ember-cli-head [![Build Status](https://travis-ci.org/ronco/ember-cli-head.svg?branch=master)](https://travis-ci.org/ronco/ember-cli-head)
+# ember-cli-head [![Build Status](https://github.com/ronco/ember-cli-head/workflows/Build/badge.svg?branch=master)](https://github.com/ronco/ember-cli-head/actions?query=branch%3Amaster+workflow%3A%22Build%22)
 
 This addon adds easy population of head tags from your Ember code
 without any direct hacky DOM manipulation.  This addon also provides
@@ -9,6 +9,12 @@ The hope is that Ember itself will provide a mechanism for populating
 head tags from your app at some time in the future.  Until then this
 addon provides that functionality.
 
+## Compatibility
+
+* Ember.js v2.18 or above
+* Ember CLI v2.13 or above
+* Node.js v10 or above
+
 ## Installation
 
 Install by running
@@ -128,3 +134,11 @@ If you care to read more about the details of render please see the PR that intr
 But for now, if you are upgrading to 0.4.x, you simply need to add `{{head-layout}}` component to your application wide template.
 
 If you make use of this mode the content of `<head>` will be the static FastBoot rendered content through the life of your App.
+
+## Contributing
+
+See the [Contributing](CONTRIBUTING.md) guide for details.
+
+## License
+
+This project is licensed under the [MIT License](LICENSE.md).

README.md

@@ -1,11 +1,11 @@
 import Component from '@ember/component';
-import { get, computed } from '@ember/object';
-import { getOwner } from '@ember/application';
+import { inject as service } from '@ember/service';
 import layout from '../templates/components/head-layout';
 
 export default Component.extend({
   tagName: '',
   layout,
+  document: service('-document'),
 
   /**
    * If true, this will tear down any existing head on init of this component.
@@ -15,15 +15,20 @@ export default Component.extend({
    */
   shouldTearDownOnInit: true,
 
-  headElement: computed(function() {
-    let documentService = getOwner(this).lookup('service:-document');
-    return documentService.head;
-  }),
+  /**
+   * The element to render into. Defaults to <head> in `init`, overridable for our own tests only.
+   * @private
+   */
+  headElement: null,
 
   init() {
     this._super(...arguments);
 
-    if (get(this, 'shouldTearDownOnInit')) {
+    if (this.get('headElement') === null) {
+      this.set('headElement', this.get('document.head'));
+    }
+
+    if (this.get('shouldTearDownOnInit')) {
       this._tearDownHead();
     }
   },
@@ -38,6 +43,7 @@ export default Component.extend({
     }
 
     // clear fast booted head (if any)
+    let document = this.get('document');
     let startMeta = document.querySelector('meta[name="ember-cli-head-start"]');
     let endMeta = document.querySelector('meta[name="ember-cli-head-end"]');
     if (startMeta && endMeta) {

addon/components/head-layout.js

@@ -1,3 +1,3 @@
-{{#-in-element headElement}}
+{{#-in-element this.headElement}}
   <meta name="ember-cli-head-start" content="">{{head-content}}<meta name="ember-cli-head-end" content="">
 {{/-in-element}}