Skip to content

Commit aee73bc

Browse files
committed
feat(showcase): add modern eslint & prettier
1 parent 278e011 commit aee73bc

File tree

183 files changed

+3969
-3671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+3969
-3671
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@glint/core": "^1.5.2",
2020
"dotenv": "^16.4.7"
2121
},
22-
"packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
22+
"packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977",
2323
"engines": {
2424
"pnpm": ">= 10.0.0"
2525
},

pnpm-lock.yaml

Lines changed: 2468 additions & 2181 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

showcase/.eslintignore

Lines changed: 0 additions & 13 deletions
This file was deleted.

showcase/.eslintrc.js

Lines changed: 0 additions & 88 deletions
This file was deleted.

showcase/.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,5 @@
1414
/testem.log
1515
/yarn-error.log
1616

17-
# ember-try
18-
/.node_modules.ember-try/
19-
/npm-shrinkwrap.json.ember-try
20-
/package.json.ember-try
21-
/package-lock.json.ember-try
22-
/yarn.lock.ember-try
23-
2417
# broccoli-debug
2518
/DEBUG/

showcase/.prettierignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/coverage/
99
!.*
1010
.*/
11-
12-
# ember-try
13-
/.node_modules.ember-try/
11+
/pnpm-lock.yaml
12+
ember-cli-update.json
13+
*.html
14+
*.scss

showcase/.prettierrc.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22

33
module.exports = {
44
plugins: ['prettier-plugin-ember-template-tag'],
5-
templateSingleQuote: false,
6-
trailingComma: 'es5',
75
overrides: [
86
{
9-
files: '*.{js,ts,gjs,gts}',
7+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
108
options: {
119
singleQuote: true,
10+
templateSingleQuote: false,
1211
},
1312
},
1413
{
1514
files: '*.hbs',
1615
options: {
17-
singleQuote: false,
1816
printWidth: 120,
1917
},
2018
},

showcase/.template-lintrc.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
'use strict';
22

33
module.exports = {
4-
plugins: ['ember-template-lint-plugin-prettier'],
5-
extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'],
4+
extends: ['recommended'],
65
rules: {
76
'no-html-comments': false,
87
'no-trailing-spaces': true,
@@ -15,14 +14,4 @@ module.exports = {
1514
'no-builtin-form-components': false,
1615
},
1716
ignore: ['blueprints/**', 'tests/**'],
18-
overrides: [
19-
// temporary fix until the prettier plugin works with `.gts/gjs` files
20-
// https://github.com/ember-template-lint/ember-template-lint-plugin-prettier/issues/268
21-
{
22-
files: ['**/*.{gjs,gts}'],
23-
rules: {
24-
prettier: false,
25-
},
26-
},
27-
],
2817
};

showcase/app/components/mock/app/main/generic-advanced-table.gts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ const SAMPLE_MODEL = [
471471

472472
const updateModelWithSelectAllState = (
473473
modelData: HdsAdvancedTableSignature['Args']['model'],
474-
selectAllState: boolean
474+
selectAllState: boolean,
475475
) => {
476476
modelData.forEach((modelRow) => {
477477
modelRow['isSelected'] = selectAllState;
@@ -480,10 +480,10 @@ const updateModelWithSelectAllState = (
480480

481481
const updateModelWithSelectableRowsStates = (
482482
modelData: HdsAdvancedTableSignature['Args']['model'],
483-
selectableRowsStates: HdsAdvancedTableOnSelectionChangeSignature['selectableRowsStates']
483+
selectableRowsStates: HdsAdvancedTableOnSelectionChangeSignature['selectableRowsStates'],
484484
) => {
485485
const modelDataMap = new Map(
486-
modelData.map((modelRow) => [modelRow['id'], modelRow])
486+
modelData.map((modelRow) => [modelRow['id'], modelRow]),
487487
);
488488
selectableRowsStates.forEach((row) => {
489489
// safe to assume that there is always a record for the "selectionKey" since it's coming from the model (the selectable "rows" are a subset of the model dataset)
@@ -505,6 +505,7 @@ export default class MockAppMainGenericAdvancedTable extends Component<MockAppMa
505505
selectionCheckboxElement,
506506
selectableRowsStates,
507507
}: HdsAdvancedTableOnSelectionChangeSignature) {
508+
// eslint-disable-next-line prefer-rest-params
508509
console.log(...arguments);
509510

510511
if (selectionKey === 'all' && this.demoModel) {

showcase/app/components/shw/frame/index.gts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default class ShwFrameComponent extends Component<ShwFrameSignature> {
3535
if (!src.match(/$\//)) {
3636
assert(
3737
`@src for "Shw::Frame" must be an absolute path (starting with '/') - Provided: ${src}`,
38-
true
38+
true,
3939
);
4040
}
4141

@@ -51,7 +51,7 @@ export default class ShwFrameComponent extends Component<ShwFrameSignature> {
5151
// we accept only px or percentage
5252
assert(
5353
`@width for "Shw::Frame" must be a number or a percentage - Provided: ${width}`,
54-
width.match(/^[\d]+%?$/)
54+
width.match(/^[\d]+%?$/),
5555
);
5656

5757
return width.match(/^[\d]+$/) ? `${width}px` : width;
@@ -66,7 +66,7 @@ export default class ShwFrameComponent extends Component<ShwFrameSignature> {
6666
// we accept only px
6767
assert(
6868
`@height for "Shw::Frame" must be a number - Provided: ${height}`,
69-
height.match(/^[\d]+?$/)
69+
height.match(/^[\d]+?$/),
7070
);
7171

7272
return `${height}px`;

0 commit comments

Comments
 (0)