Ember 3.26, ember-cli-head 2.0.0, remove ember-get-config

.eslintignore

@@ -13,6 +13,7 @@
 # misc
 /coverage/
 !.*
+.eslintcache
 
 # ember-try
 /.node_modules.ember-try/

.eslintrc.js

@@ -7,52 +7,51 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
     ecmaFeatures: {
-      legacyDecorators: true
-    }
+      legacyDecorators: true,
+    },
   },
-  plugins: [
-    'ember'
-  ],
+  plugins: ['ember'],
   extends: [
     'eslint:recommended',
-    'plugin:ember/recommended'
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
   ],
   env: {
-    browser: true
+    browser: true,
   },
   rules: {
-    'ember/no-jquery': 'error'
+    'ember/no-classic-classes': 'off',
+    'ember/no-computed-properties-in-native-classes': 'off',
   },
   overrides: [
     // node files
     {
       files: [
         '.eslintrc.js',
+        '.prettierrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
-        'tests/dummy/config/**/*.js'
+        'tests/dummy/config/**/*.js',
       ],
       excludedFiles: [
         'addon/**',
         'addon-test-support/**',
         'app/**',
-        'tests/dummy/app/**'
+        'tests/dummy/app/**',
       ],
       parserOptions: {
-        sourceType: 'script'
+        sourceType: 'script',
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      })
-    }
-  ]
+      extends: ['plugin:node/recommended'],
+    },
+  ],
 };

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10
+  labels:
+  - dependencies
+  ignore:
+  - dependency-name: ember-cli
+    versions:
+    - ">= 0"

.github/workflows/main.yml

@@ -17,25 +17,25 @@ jobs:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - run: yarn install --frozen-lockfile
       - run: yarn lint
       - run: yarn test:ember
 
   floating-dependencies:
-    name: "Floating Dependencies"
+    name: 'Floating Dependencies'
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - run: yarn install --no-lockfile
       - run: yarn test:ember
 
   try-scenarios:
-    name: "Try: ${{ matrix.ember-try-scenario }}"
+    name: 'Try: ${{ matrix.ember-try-scenario }}'
 
     runs-on: ubuntu-latest
 
@@ -52,6 +52,8 @@ jobs:
           - ember-canary
           - ember-default-with-jquery
           - ember-classic
+          - embroider-safe
+          - embroider-optimized
 
     steps:
       - uses: actions/checkout@v2
@@ -61,4 +63,12 @@ jobs:
       - name: install dependencies
         run: yarn install --frozen-lockfile
       - name: test
-        run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+        run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+
+  automerge:
+    needs: [test, floating-dependencies, try-scenarios]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: fastify/github-action-merge-dependabot@v2.0.0
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -12,6 +12,7 @@
 /.env*
 /.pnp*
 /.sass-cache
+/.eslintcache
 /connect.lock
 /coverage/
 /libpeerconnection.log

.npmignore

@@ -10,10 +10,13 @@
 /.editorconfig
 /.ember-cli
 /.env*
+/.eslintcache
 /.eslintignore
 /.eslintrc.js
 /.git/
 /.gitignore
+/.prettierignore
+/.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig

.prettierignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.prettierrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};

.template-lintrc.js

@@ -3,7 +3,8 @@
 module.exports = {
   extends: 'octane',
   rules: {
+    'no-forbidden-elements': false,
     // TODO: maybe enable this again?
-    'no-invalid-meta': false
-  }
+    'no-invalid-meta': false,
+  },
 };

CONTRIBUTING.md

@@ -8,9 +8,8 @@
 
 ## Linting
 
-* `yarn lint:hbs`
-* `yarn lint:js`
-* `yarn lint:js --fix`
+* `yarn lint`
+* `yarn lint:fix`
 
 ## Running tests
 

README.md

@@ -17,7 +17,7 @@ Setup meta for your Prember/Ember blog to support opengraph, microdata, Facebook
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v3.12 or above
+* Ember.js v3.16 or above
 * Ember CLI v2.13 or above
 * Node.js v10 or above
 

addon/services/head-data.js

@@ -2,14 +2,14 @@ import Service, { inject as service } from '@ember/service';
 import { computed } from '@ember/object';
 import { alias, reads } from '@ember/object/computed';
 import { getOwner } from '@ember/application';
-import config from 'ember-get-config';
 
 export default class HeadDataService extends Service {
   @service router;
 
   @alias('router.currentRouteName') routeName;
 
   get config() {
+    const config = getOwner(this).resolveRegistration('config:environment');
     return config['ember-meta'];
   }
 
@@ -51,7 +51,12 @@ export default class HeadDataService extends Service {
    * If you pass a description, it will be used, otherwise it will truncate your content,
    * and finally it will use the description from the global config.
    */
-  @computed('content', 'currentRouteMeta.description', 'routeName', 'config.description')
+  @computed(
+    'content',
+    'currentRouteMeta.description',
+    'routeName',
+    'config.description'
+  )
   get description() {
     const description = this.currentRouteMeta?.description;
     const content = this.content;
@@ -120,9 +125,15 @@ export default class HeadDataService extends Service {
   /**
    * Used for twitter:site and twitter:creator
    */
-  @computed('currentRouteMeta.twitterUsername', 'routeName', 'config.twitterUsername')
+  @computed(
+    'currentRouteMeta.twitterUsername',
+    'routeName',
+    'config.twitterUsername'
+  )
   get twitterUsername() {
-    return this.currentRouteMeta?.twitterUsername ?? this.config.twitterUsername;
+    return (
+      this.currentRouteMeta?.twitterUsername ?? this.config.twitterUsername
+    );
   }
 
   /**

blueprints/ember-meta/index.js

@@ -1,3 +1,3 @@
 module.exports = {
-  normalizeEntityName() { }
+  normalizeEntityName() {},
 };