Merge pull request #94 from cibernox/update-to-glimmer

Author: rwjblue

.eslintignore

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

.eslintrc.js

@@ -7,53 +7,48 @@ 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
-  },
-  rules: {
-    'ember/no-jquery': 'error',
-    'ember/no-get': 'off',
+    browser: true,
   },
+  rules: {},
   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/workflows/build.yml

@@ -19,41 +19,33 @@ jobs:
       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
-          - embroider
+          - ember-default-with-jquery
+          - ember-release
+          - ember-beta
+          - ember-canary
+          - ember-lts-3.16
+          - ember-lts-3.20
+          - embroider-safe
+          - embroider-optimized
+
     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: Install dependencies
+        run: npm ci
       - name: Setup ember-try scenario
-        if: matrix.scenario != 'default' && matrix.scenario != 'default-with-lockfile'
+        if: matrix.scenario != 'default-with-lockfile'
         run: >-
-          yarn ember try:one ember-${{ matrix.scenario }} --skip-cleanup ---
+          npx ember try:one ${{ matrix.scenario }} --skip-cleanup ---
           '[ -z "$EMBER_OPTIONAL_FEATURES" ] || echo "EMBER_OPTIONAL_FEATURES=$EMBER_OPTIONAL_FEATURES" >> $GITHUB_ENV'
-      - name: Lint (hbs)
-        run: yarn lint:hbs
-      - name: Lint (js)
-        run: yarn lint:js
+      - name: Lint
+        run: npm run lint
       - name: Build
-        run: yarn ember build --environment test
+        run: npx 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
+        run: EMBER_ENV=test npm run test:ember -- --path dist

.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

@@ -1,8 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended',
-  rules: {
-    'no-html-comments': false
-  }
+  extends: 'octane',
 };

CONTRIBUTING.md

@@ -4,13 +4,12 @@
 
 * `git clone <repository-url>`
 * `cd ember-cli-head`
-* `yarn install`
+* `npm ci`
 
 ## Linting
 
-* `yarn lint:hbs`
-* `yarn lint:js`
-* `yarn lint:js --fix`
+* `npm run lint`
+* `npm run lint:fix`
 
 ## Running tests
 

README.md

@@ -6,12 +6,9 @@ This addon lets you populate `<head>` tag from your Ember code without any direc
 
 The hope is that, in the future, Ember will provide a mechanism for populating `<head>` tag from your app. Until then, this addon provides that functionality.
 
-
-## Compatibility
-
-* Ember.js v2.18 or above
+* Ember.js v3.16 or above
 * Ember CLI v2.13 or above
-* Node.js v10 or above
+* Node.js v12 or above
 
 
 ## Installation