Skip to content

Commit 92bbb48

Browse files
authored
Merge pull request #1011 from ember-learn/ember-composable-helpers
remove the only use of ember-composable-helpers
2 parents 07c7b9e + 5c43623 commit 92bbb48

5 files changed

Lines changed: 18 additions & 48 deletions

File tree

app/components/class-field-description.gjs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { service } from '@ember/service';
22
import Component from '@glimmer/component';
3-
import join from 'ember-composable-helpers/helpers/join';
4-
import mapBy from 'ember-composable-helpers/helpers/map-by';
53
import svgJar from 'ember-svg-jar/helpers/svg-jar';
64
import { LinkTo } from '@ember/routing';
75
import { array, concat } from '@ember/helper';
@@ -11,6 +9,15 @@ import eq from 'ember-api-docs/helpers/eq';
119
import ImportExample from 'ember-api-docs/components/import-example';
1210
import MarkdownToHtml from 'ember-cli-showdown/components/markdown-to-html';
1311

12+
/**
13+
* Extract the name field from the passed items an string-join them with `, ` in the middle
14+
*
15+
* @param {[{name: string}]} items
16+
*/
17+
function combineNames(items) {
18+
return items.map((item) => item.name).join(', ');
19+
}
20+
1421
export default class ClassFieldDescription extends Component {
1522
<template>
1623
{{! template-lint-disable no-invalid-interactive }}
@@ -20,9 +27,8 @@ export default class ClassFieldDescription extends Component {
2027
<span class="{{@type}}-name">
2128
{{@field.name}}
2229
</span>
23-
{{#if @field.params}}(<span class="args">{{join
24-
", "
25-
(mapBy "name" @field.params)
30+
{{#if @field.params}}(<span class="args">{{combineNames
31+
@field.params
2632
}}</span>){{/if}}
2733
{{#if @field.return}}
2834
:

ember-cli-build.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ module.exports = function (defaults) {
1919
sourcemap: !envIsProduction,
2020
overrideBrowsersList: ['default'],
2121
},
22-
'ember-composable-helpers': {
23-
only: ['join', 'map-by'],
24-
},
2522
'asset-cache': {
2623
version: '4', //Might have to change this with the app build,
2724
},

eslint.config.mjs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ export default [
4343
* https://eslint.org/docs/latest/use/configure/ignore
4444
*/
4545
{
46-
ignores: ['dist/', 'node_modules/', 'coverage/', '!**/.*'],
46+
ignores: [
47+
'dist/',
48+
'node_modules/',
49+
'coverage/',
50+
'!**/.*',
51+
'ember-api-docs-data',
52+
],
4753
},
4854
/**
4955
* https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
"ember-cli-inject-live-reload": "^2.1.0",
7171
"ember-cli-showdown": "^9.0.1",
7272
"ember-cli-terser": "^4.0.2",
73-
"ember-composable-helpers": "^5.0.0",
7473
"ember-concurrency": "^4.0.6",
7574
"ember-data": "~4.12.8",
7675
"ember-data-fastboot": "https://github.com/kategengler/ember-data-fastboot#v0.0.1",

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)