Skip to content

Commit

Permalink
run ember-cli-update
Browse files Browse the repository at this point in the history
  • Loading branch information
amk221 committed May 17, 2022
1 parent adf6fac commit 47fcb49
Show file tree
Hide file tree
Showing 17 changed files with 3,145 additions and 1,331 deletions.
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
}
9 changes: 1 addition & 8 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
'use strict';

module.exports = {
extends: '@zestia/eslint-config/ember-addon',

rules: {
// Temporarily disabled due to:
// https://github.com/ember-template-lint/eslint-plugin-hbs/issues/42
// https://github.com/ember-template-lint/eslint-plugin-hbs/issues/44
'hbs/check-hbs-template-literals': 'off'
}
extends: '@zestia/eslint-config/ember-addon'
};
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
needs: 'test'
needs: "test"

strategy:
fail-fast: false
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
6 changes: 3 additions & 3 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
'use strict';

module.exports = require('@zestia/stylelint-config');
module.exports = {
extends: '@zestia/stylelint-config'
};
5 changes: 4 additions & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
'use strict';

module.exports = require('@zestia/template-lint-config');
module.exports = {
plugins: ['@zestia/template-lint-config'],
extends: 'zestia:recommended'
};
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,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://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
2 changes: 1 addition & 1 deletion addon/components/expander/content.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class="expander__content"
style={{@style}}
...attributes
{{this.lifecycleHooks didInstall=@onInsert}}
{{did-insert @onInsert}}
>
{{yield}}
</div>
6 changes: 0 additions & 6 deletions addon/components/expander/content.js

This file was deleted.

7 changes: 2 additions & 5 deletions addon/components/expander/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@
aria-expanded="{{this.isExpanded}}"
tabindex="0"
...attributes
{{this.lifecycleHooks
@expanded
didInstall=this.handleInsertElement
didUpdateArguments=this.handleUpdatedArguments
}}
{{did-insert this.handleInsertElement}}
{{did-update this.handleUpdatedArguments @expanded}}
>
{{yield this.api}}
</div>
17 changes: 0 additions & 17 deletions addon/components/expander/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Component from '@glimmer/component';
import ExpanderContent from './content';
import Modifier from 'ember-modifier';
import { htmlSafe } from '@ember/template';
import { tracked } from '@glimmer/tracking';
import { waitFor } from '@ember/test-waiters';
Expand All @@ -11,28 +10,12 @@ import { task } from 'ember-concurrency';
import { waitForAnimation } from '@zestia/animation-utils';
const { assign } = Object;

export class LifecycleHooks extends Modifier {
didInstall() {
this.args.named.didInstall(this.element);
}

didUpdateArguments() {
this.args.named.didUpdateArguments?.();
}

willDestroy() {
super.willDestroy(...arguments);
this.args.named.willDestroy?.();
}
}

const registerComponents = helper(function ([component], components) {
assign(component, components);
});

class ExpanderComponent extends Component {
ExpanderContent = ExpanderContent;
lifecycleHooks = LifecycleHooks;
registerComponents = registerComponents;

@tracked maxHeight = null;
Expand Down
Loading

0 comments on commit 47fcb49

Please sign in to comment.