Skip to content

Commit

Permalink
Update to Ember 3.12 (#487)
Browse files Browse the repository at this point in the history
* Update to Ember 3.12

* Fix tests
  • Loading branch information
cibernox committed Aug 17, 2019
1 parent d1bb0ec commit 48cacd4
Show file tree
Hide file tree
Showing 8 changed files with 369 additions and 264 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Expand Up @@ -16,7 +16,8 @@ module.exports = {
browser: true
},
rules: {
'ember/avoid-leaking-state-in-ember-objects': 0
'ember/avoid-leaking-state-in-ember-objects': 0,
'ember/no-jquery': 'error'
},
overrides: [
// node files
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Expand Up @@ -12,6 +12,7 @@
/.env*
/.eslintignore
/.eslintrc.js
/.git/
/.gitignore
/.template-lintrc.js
/.travis.yml
Expand Down
4 changes: 1 addition & 3 deletions addon/components/basic-dropdown-content.js
Expand Up @@ -50,9 +50,7 @@ function dropdownIsValidParent(el, dropdownId) {
return false;
}
}
@layout(templateLayout)
@tagName('')
export default class BasicDropdownContent extends Component {
export default @layout(templateLayout) @tagName('')class BasicDropdownContent extends Component {
isTouchDevice = Boolean(!!window && 'ontouchstart' in window);
hasMoved = false;
animationClass = '';
Expand Down
4 changes: 1 addition & 3 deletions addon/components/basic-dropdown-trigger.js
Expand Up @@ -3,9 +3,7 @@ import { action } from "@ember/object";
import Component from "@ember/component";
import templateLayout from '../templates/components/basic-dropdown-trigger';

@layout(templateLayout)
@tagName('')
export default class BasicDropdownTrigger extends Component {
export default @layout(templateLayout) @tagName('') class BasicDropdownTrigger extends Component {
eventType = 'click';
stopPropagation = false;

Expand Down
4 changes: 1 addition & 3 deletions addon/components/basic-dropdown.js
Expand Up @@ -19,9 +19,7 @@ const ignoredStyleAttrs = [
'height'
];

@layout(templateLayout)
@tagName('')
export default class BasicDropdown extends Component {
export default @layout(templateLayout) @tagName('') class BasicDropdown extends Component {
top = null;
left = null;
right = null;
Expand Down
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -24,9 +24,9 @@
],
"devDependencies": {
"@ember/optional-features": "^0.7.0",
"babel-eslint": "^8.0.0",
"babel-eslint": "^10.0.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.11.0-beta.3",
"ember-cli": "~3.13.0-beta.1",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-fastboot": "^2.0.0",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
Expand All @@ -46,7 +46,7 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.4.1",
"ember-resolver": "^5.0.1",
"ember-source": "~3.11.0",
"ember-source": "~3.12.0",
"ember-source-channel-url": "^1.1.0",
"ember-try": "^1.1.0",
"eslint": "^5.10.0",
Expand Down
1 change: 0 additions & 1 deletion testem.js
Expand Up @@ -14,7 +14,6 @@ module.exports = {
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--touch-events',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
Expand Down

0 comments on commit 48cacd4

Please sign in to comment.