Merge pull request #30 from phorest/chore/upgrade-ember

🔼 Upgrade Ember v3.21.2...v3.26.1

.eslintignore

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

.eslintrc.js

@@ -1,54 +1,57 @@
 'use strict';
 
 module.exports = {
+  globals: {
+    window: true,
+  },
   root: true,
   parser: 'babel-eslint',
   parserOptions: {
     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: {},
   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'],
-      extends: ['plugin:node/recommended']
-    }
-  ]
+      extends: ['plugin:node/recommended'],
+    },
+  ],
 };

.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,5 +1,9 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane'
+  extends: 'octane',
+
+  rules: {
+    'no-down-event-binding': 'warn',
+  },
 };

.travis.yml

@@ -53,6 +53,8 @@ jobs:
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
     - env: EMBER_TRY_SCENARIO=ember-classic
+    - env: EMBER_TRY_SCENARIO=embroider-safe
+    - env: EMBER_TRY_SCENARIO=embroider-optimized
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash

CONTRIBUTING.md

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

addon/components/menu.hbs

@@ -35,4 +35,4 @@
       goToItem=this.goToItem
     )
   )}}
-</div>
+</div>

addon/components/menu.js

@@ -1,8 +1,8 @@
-import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
-import { action } from "@ember/object";
-import { guidFor } from "@ember/object/internals";
-import { next } from "@ember/runloop";
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import { guidFor } from '@ember/object/internals';
+import { next } from '@ember/runloop';
 
 export default class Menu extends Component {
   guid = `${guidFor(this)}-tailwindui-menu`;

addon/components/menu/button.js

@@ -1,17 +1,17 @@
-import Component from "@glimmer/component";
-import { action } from "@ember/object";
-import { next } from "@ember/runloop";
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { next } from '@ember/runloop';
 
 export default class Button extends Component {
   @action
   onKeydown(event) {
     switch (event.key) {
-      case " ":
-      case "Enter":
-      case "ArrowDown":
+      case ' ':
+      case 'Enter':
+      case 'ArrowDown':
         event.preventDefault();
 
-        if (this.args.isOpen && event.key === "Enter") {
+        if (this.args.isOpen && event.key === 'Enter') {
           this.args.closeMenu();
         } else {
           this.args.openMenu();
@@ -20,7 +20,7 @@ export default class Button extends Component {
           });
         }
         break;
-      case "ArrowUp":
+      case 'ArrowUp':
         event.preventDefault();
         this.args.openMenu();
 

addon/components/menu/item.js

@@ -1,7 +1,7 @@
-import Component from "@glimmer/component";
-import { action } from "@ember/object";
-import { guidFor } from "@ember/object/internals";
-import { tracked } from "@glimmer/tracking";
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { guidFor } from '@ember/object/internals';
+import { tracked } from '@glimmer/tracking';
 
 export default class Item extends Component {
   guid = `${guidFor(this)}-tailwindui-menu-item`;

addon/components/menu/items.hbs

@@ -16,4 +16,4 @@
       )
     )}}
   </div>
-{{/if}}
+{{/if}}

addon/components/menu/items.js

@@ -1,20 +1,20 @@
-import Component from "@glimmer/component";
-import { action } from "@ember/object";
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
 
 export default class Items extends Component {
   @action
   onKeydown(event) {
     switch (event.key) {
       // Ref: https://www.w3.org/TR/wai-aria-practices-1.2/#keyboard-interaction-12
-      case "Enter":
+      case 'Enter':
         if (this.args.activeItem) {
           this.args.activeItem.element.click();
         }
         this.args.closeMenu();
         break;
-      case "ArrowDown":
+      case 'ArrowDown':
         return this.args.goToNextItem();
-      case "ArrowUp":
+      case 'ArrowUp':
         return this.args.goToPreviousItem();
     }
   }

addon/components/switch.js

@@ -1,6 +1,6 @@
-import Component from "@glimmer/component";
-import { action } from "@ember/object";
-import { guidFor } from "@ember/object/internals";
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { guidFor } from '@ember/object/internals';
 
 export default class Switch extends Component {
   guid = `${guidFor(this)}-tailwindui-switch`;
@@ -23,7 +23,7 @@ export default class Switch extends Component {
   @action
   onButtonKeyUp(event) {
     event.preventDefault();
-    if (event.key === " ") {
+    if (event.key === ' ') {
       event.preventDefault();
       this._toggle();
     }

app/components/menu.js

@@ -1 +1 @@
-export { default } from "ember-headlessui/components/menu";
+export { default } from 'ember-headlessui/components/menu';

app/components/menu/button.js

@@ -1 +1 @@
-export { default } from "ember-headlessui/components/menu/button";
+export { default } from 'ember-headlessui/components/menu/button';

app/components/menu/item-element.js

@@ -1 +1 @@
-export { default } from "ember-headlessui/components/menu/item-element";
+export { default } from 'ember-headlessui/components/menu/item-element';

app/components/menu/item.js

@@ -1 +1 @@
-export { default } from "ember-headlessui/components/menu/item";
+export { default } from 'ember-headlessui/components/menu/item';

app/components/menu/items.js

@@ -1 +1 @@
-export { default } from "ember-headlessui/components/menu/items";
+export { default } from 'ember-headlessui/components/menu/items';

app/components/switch.js

@@ -1 +1 @@
-export { default } from "ember-headlessui/components/switch";
+export { default } from 'ember-headlessui/components/switch';

app/components/switch/button.js

@@ -1 +1 @@
-export { default } from "ember-headlessui/components/switch/button";
+export { default } from 'ember-headlessui/components/switch/button';

app/components/switch/label.js

@@ -1 +1 @@
-export { default } from "ember-headlessui/components/switch/label";
+export { default } from 'ember-headlessui/components/switch/label';