Skip to content

Commit

Permalink
Merge pull request #1642 from NullVoxPopuli/handle-lint-upgrades
Browse files Browse the repository at this point in the history
Handle Lint Upgrades
  • Loading branch information
NullVoxPopuli authored Jul 5, 2021
2 parents 30911c2 + 520860e commit 7247897
Show file tree
Hide file tree
Showing 37 changed files with 2,198 additions and 3,274 deletions.
4 changes: 2 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"extends": [
"config:base"
],
"automerge": true,
"automerge": false,
"masterIssue": true,
"ignorePaths": [
// Deployed once and forgotten
Expand Down Expand Up @@ -70,7 +70,7 @@
"eslint",
"babel-eslint",
"ember-template-lint",
"prettier"
"prettier"
],
"packagePatterns": [
"eslint-plugin-.*",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web-addon-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: "Styles"
working-directory: ${{ env.root }}
run: yarn stylelint ${{ env.addon }}/**/*.css
run: yarn stylelint ${{ env.addon }}**/*.css

- name: 'Type Correctness'
working-directory: ${{ env.full }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web-app-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: "Styles"
working-directory: ${{ env.root }}
run: yarn stylelint ${{ env.app }}/**/*.css
run: yarn stylelint ${{ env.app }}**/*.css

- name: "Translations"
working-directory: ${{ env.full }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web-pinochle-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: "Styles"
working-directory: ${{ env.root }}
run: yarn stylelint ${{ env.app }}/**/*.css
run: yarn stylelint ${{ env.app }}**/*.css

- name: 'Type Correctness'
working-directory: ${{ env.full }}
Expand Down
8 changes: 4 additions & 4 deletions client/web/addons/local-account/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"ember-auto-import": "1.11.3",
"ember-cli-babel": "7.26.6",
"ember-cli-htmlbars": "5.7.1",
"ember-concurrency": "2.0.3",
"ember-concurrency-async": "1.0.0",
"ember-concurrency": "1.3.0",
"ember-concurrency-async": "0.3.2",
"ember-concurrency-decorators": "2.0.3",
"ember-concurrency-test-waiter": "0.4.0",
"ember-concurrency-ts": "0.2.2",
Expand All @@ -47,13 +47,13 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@emberclear/config": "*",
"@nullvoxpopuli/eslint-configs": "1.3.2",
"@emberclear/questionably-typed": "*",
"@emberclear/test-helpers": "*",
"@glimmer/component": "1.0.4",
"@glimmer/tracking": "1.0.4",
"@nullvoxpopuli/eslint-configs": "1.3.2",
"@types/ember": "3.16.5",
"@types/ember-data": "3.16.13",
"@types/ember-data": "3.16.14",
"@types/ember-data__model": "3.16.2",
"@types/ember-data__store": "3.16.1",
"@types/ember-qunit": "3.4.13",
Expand Down
10 changes: 5 additions & 5 deletions client/web/addons/networking/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"ember-auto-import": "1.11.3",
"ember-cli-babel": "7.26.6",
"ember-cli-htmlbars": "5.7.1",
"ember-concurrency": "2.0.3",
"ember-concurrency-async": "1.0.0",
"ember-concurrency": "1.3.0",
"ember-concurrency-async": "0.3.2",
"ember-concurrency-decorators": "2.0.3",
"ember-concurrency-test-waiter": "0.4.0",
"ember-concurrency-ts": "0.2.2",
Expand All @@ -43,13 +43,13 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@emberclear/config": "*",
"@nullvoxpopuli/eslint-configs": "1.3.2",
"@emberclear/questionably-typed": "*",
"@emberclear/test-helpers": "*",
"@glimmer/component": "1.0.4",
"@glimmer/tracking": "1.0.4",
"@nullvoxpopuli/eslint-configs": "1.3.2",
"@types/ember": "3.16.5",
"@types/ember-data": "3.16.13",
"@types/ember-data": "3.16.14",
"@types/ember-data__model": "3.16.2",
"@types/ember-data__store": "3.16.1",
"@types/ember-qunit": "3.4.13",
Expand All @@ -58,7 +58,7 @@
"@types/phoenix": "1.5.1",
"@types/qunit": "2.11.1",
"@types/rsvp": "4.0.3",
"@types/uuid": "8.3.0",
"@types/uuid": "8.3.1",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "3.26.1",
"ember-cli-dependency-checker": "^3.2.0",
Expand Down
4 changes: 2 additions & 2 deletions client/web/addons/test-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
"@ember/optional-features": "^2.0.0",
"@emberclear/config": "*",
"@emberclear/questionably-typed": "*",
"@nullvoxpopuli/eslint-configs": "1.3.2",
"@glimmer/component": "1.0.4",
"@glimmer/tracking": "1.0.4",
"@nullvoxpopuli/eslint-configs": "1.3.2",
"@types/ember": "3.16.5",
"@types/ember-data": "3.16.13",
"@types/ember-data": "3.16.14",
"@types/ember-data__model": "3.16.2",
"@types/ember-data__store": "3.16.1",
"@types/ember-qunit": "3.4.13",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ module('Integration | Component | switch', function (hooks) {
/>
`);

assert.equal(page.isChecked, true, 'is checked');
assert.true(page.isChecked, 'is checked');

await page.check();

assert.equal(page.isChecked, false, 'not checked');
assert.false(page.isChecked, 'not checked');
});
});
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{!-- template-lint-disable no-inline-styles --}}
<nav class='actions' style='height: 100%; overflow-y: auto;' data-test-actions-list>

<div data-test-sidebar-content-header class='menu-label'>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<form data-test-channel-form {{on 'submit' (prevent-default this.onFormSubmit)}}>
{{!-- template-lint-disable require-input-label --}}
<input
class='input'
type='text'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{{!-- template-lint-disable no-inline-styles --}}
<nav class='contacts' style='overflow-y: hidden;' data-test-contacts-list>
{{!-- template-lint-disable require-input-label --}}
{{#if this.contactManager.isImporting}}
<EllipsisLoader />
{{else}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{!-- template-lint-disable no-inline-styles --}}
<button
type='button'
class='
Expand Down
1 change: 1 addition & 0 deletions client/web/emberclear/app/components/app/top-nav/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/>

{{#if this.hasUnread}}
{{!-- template-lint-disable no-inline-styles --}}
<span
data-test-unread-count
class='badge badge-warning'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#if this.window.canInstall}}
<button type='button' {{on 'click' (fn this.install)}}>
<button type='button' {{on 'click' this.install}}>
{{t 'install'}}
</button>
{{/if}}
2 changes: 2 additions & 0 deletions client/web/emberclear/app/components/file-chooser/index.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{{!-- template-lint-disable no-inline-styles --}}
{{!-- template-lint-disable require-input-label --}}
<input
style='display: none;'
type='file'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<hr>

<div class='snippet-title-bar'>
{{!-- template-lint-disable require-input-label --}}
<Input
placeholder='Title (optional)'
@value={{this.title}}
Expand All @@ -24,6 +25,7 @@
</div>
</div>

{{!-- template-lint-disable require-input-label --}}
<Textarea
autofocus={{true}}
class='snippet-entry'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Pod::Chat::ChatEntry::EmbedsMenu @sendTo={{@to}} />
</div>

{{!-- template-lint-disable require-input-label --}}
<form
data-test-chat-entry-form
class='chat-entry'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
<div class='login-form-contents'>
<div class='left'>
<Field @label={{t 'input.label.name'}}>
{{!-- template-lint-disable require-input-label --}}
<Input data-test-name @value={{this.name}} />
</Field>

<Field @label={{t 'input.label.mnemonic'}}>
{{!-- template-lint-disable require-input-label --}}
<Input data-test-mnemonic @value={{this.mnemonic}} />
</Field>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
</Field>

<div class='cta'>
{{!-- template-lint-disable require-input-label --}}
<input
data-test-save
class='button'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
{{#if this.isVisible}}
<form {{on 'submit' (prevent-default this.submit)}} data-test-add-relay-form>
<Field @label='Socket URL'>
{{!-- template-lint-disable require-input-label --}}
<Input
data-test-socket-field
class='input'
Expand All @@ -22,6 +23,7 @@
</Field>

<Field @label='Open Graph URL'>
{{!-- template-lint-disable require-input-label --}}
<Input
data-test-og-field
class='input'
Expand All @@ -30,6 +32,7 @@
</Field>

<div class='flex justify-content-end'>
{{!-- template-lint-disable require-input-label --}}
<input data-test-save-relay class='button' type='submit' value={{t 'buttons.save'}}>
</div>
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<form data-test-name-form {{on 'submit' this.createIdentity}}>

<Field @label={{t 'models.identity.name'}} @hidden={{true}}>
{{!-- template-lint-disable require-input-label --}}
<Input
data-test-name-field
class='input-xl'
type='text'
placeholder={{t 'ui.setup.nameLabel'}}
@value={{this.name}}
/>
Expand Down
1 change: 1 addition & 0 deletions client/web/emberclear/app/components/search/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
role='search'>

<Field @label={{t 'ui.search.title'}} @hidden={{true}}>
{{!-- template-lint-disable require-input-label --}}
<input
type='text'
class='input-lg'
Expand Down
1 change: 1 addition & 0 deletions client/web/emberclear/app/templates/invite.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{!-- template-lint-disable no-inline-styles --}}
<div
id='app-loader'
style='
Expand Down
16 changes: 8 additions & 8 deletions client/web/emberclear/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@emberclear/networking": "*",
"@emberclear/ui": "*",
"ember-browser-services": "1.1.6",
"ember-concurrency": "2.0.3",
"ember-concurrency-async": "1.0.0",
"ember-concurrency": "1.3.0",
"ember-concurrency-async": "0.3.2",
"ember-concurrency-decorators": "2.0.3",
"ember-concurrency-test-waiter": "0.4.0",
"ember-concurrency-ts": "0.2.2",
Expand All @@ -79,28 +79,28 @@
"@ember/test-helpers": "2.2.8",
"@emberclear/config": "*",
"@emberclear/questionably-typed": "*",
"@nullvoxpopuli/eslint-configs": "1.3.2",
"@emberclear/test-helpers": "*",
"@embroider/compat": "0.40.0",
"@embroider/core": "0.40.0",
"@embroider/webpack": "0.40.0",
"@glimmer/component": "1.0.4",
"@glimmer/tracking": "1.0.4",
"@html-next/vertical-collection": "2.0.0",
"@nullvoxpopuli/eslint-configs": "1.3.2",
"@types/bip39": "3.0.0",
"@types/common-tags": "1.8.0",
"@types/dompurify": "2.2.2",
"@types/ember-data": "3.16.13",
"@types/ember": "3.16.5",
"@types/ember-data": "3.16.14",
"@types/ember-data__model": "3.16.2",
"@types/ember-data__store": "3.16.1",
"@types/ember-test-helpers": "1.0.9",
"@types/ember-testing-helpers": "0.0.4",
"@types/ember": "3.16.5",
"@types/ember-qunit": "3.4.13",
"@types/ember-resolver": "5.0.10",
"@types/ember-test-helpers": "1.0.9",
"@types/ember-testing-helpers": "0.0.4",
"@types/ember__application": "3.16.2",
"@types/ember__array": "3.16.4",
"@types/ember__component": "3.16.4",
"@types/ember__component": "3.16.5",
"@types/ember__controller": "3.16.4",
"@types/ember__debug": "3.16.3",
"@types/ember__engine": "3.16.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module('Acceptance | Chat | Privately With', function (hooks) {
assert.ok(document.title.startsWith('emberclear'));
});

module('anyone', async function (hooks) {
module('anyone', function (hooks) {
setupRelayConnectionMocks(hooks);

hooks.beforeEach(async function () {
Expand Down Expand Up @@ -312,12 +312,8 @@ module('Acceptance | Chat | Privately With', function (hooks) {
});

test('UI elements are configured appropriately', function (assert) {
assert.equal(page.isScrollable(), false, 'is not scrollable');
assert.equal(
page.newMessagesFloater.isHidden,
true,
'new messages floater is not shown'
);
assert.false(page.isScrollable(), 'is not scrollable');
assert.true(page.newMessagesFloater.isHidden, 'new messages floater is not shown');
});
});

Expand Down Expand Up @@ -357,13 +353,9 @@ module('Acceptance | Chat | Privately With', function (hooks) {
});

test('most recent messages are shown', async function (assert) {
assert.equal(page.isScrollable(), true, 'is scrollable');
assert.true(page.isScrollable(), 'is scrollable');

assert.equal(
page.newMessagesFloater.isHidden,
true,
'more messages below is not visible'
);
assert.true(page.newMessagesFloater.isHidden, 'more messages below is not visible');
// TODO: Investigate the implementation of isNotVisible
//assert.dom(`[data-id="${firstMessage.id}"]`).isNotVisible();
assert.dom(`[data-id="${lastMessage.id}"]`).exists();
Expand All @@ -379,7 +371,7 @@ module('Acceptance | Chat | Privately With', function (hooks) {
});

test('the more messages floater is visible', function (assert) {
assert.equal(page.newMessagesFloater.isHidden, false);
assert.false(page.newMessagesFloater.isHidden);
});

module('after clicking the new messages floater', function (hooks) {
Expand All @@ -400,7 +392,7 @@ module('Acceptance | Chat | Privately With', function (hooks) {
});
});

module('there are many unread messages', function () {
module('there are many unread messages', function (hooks) {
hooks.beforeEach(async function () {
// let currentUser = getService('current-user').record!;
// let numMessages = 30;
Expand Down
Loading

0 comments on commit 7247897

Please sign in to comment.