Skip to content

Commit 0d86368

Browse files
committed
feat: apply declarations generation and fix linters
1 parent 15e634b commit 0d86368

15 files changed

Lines changed: 339 additions & 102 deletions

File tree

.stylelintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33

44
# compiled output
55
/dist/
6+
/dist-tests/
File renamed without changes.

config/ember-cli-update.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
22
"schemaVersion": "1.0.0",
3+
"projectName": "ember-drag-sort",
34
"packages": [
45
{
56
"name": "@ember/addon-blueprint",
67
"version": "0.17.1",
78
"blueprints": [
89
{
9-
"name": "addon",
10+
"name": "@ember/addon-blueprint",
1011
"isBaseBlueprint": true,
1112
"options": [
12-
"--pnpm"
13+
"--pnpm",
14+
"--typescript"
1315
]
1416
}
1517
]

demo-app/templates/index.gts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ import NestedItem from '../components/nested-item';
325325
<article class="list">
326326
<h4>Table 1</h4>
327327

328+
{{! template-lint-disable table-groups }}
328329
<DragSortList
329330
id="table-1"
330331
@items={{@controller.table1}}
@@ -345,6 +346,7 @@ import NestedItem from '../components/nested-item';
345346
<article class="list">
346347
<h4>Table 2</h4>
347348

349+
{{! template-lint-disable table-groups }}
348350
<DragSortList
349351
id="table-2"
350352
@items={{@controller.table2}}

eslint.config.mjs

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ const esmParserOptions = {
2727
ecmaVersion: 'latest',
2828
};
2929

30+
const tsParserOptions = {
31+
projectService: true,
32+
tsconfigRootDir: import.meta.dirname,
33+
};
34+
3035
export default defineConfig([
3136
globalIgnores(['dist/', 'dist-*/', 'declarations/', 'coverage/', '!**/.*']),
3237
js.configs.recommended,
@@ -58,17 +63,23 @@ export default defineConfig([
5863
},
5964
},
6065
{
61-
files: ['**/*.ts', '**/*.gts'],
66+
files: ['**/*.{ts,gts}'],
6267
languageOptions: {
63-
parser: ts.parser,
64-
parserOptions: {
65-
projectService: true,
66-
tsconfigRootDir: import.meta.dirname,
68+
parser: ember.parser,
69+
parserOptions: tsParserOptions,
70+
globals: {
71+
...globals.browser,
6772
},
6873
},
69-
plugins: {
70-
'@typescript-eslint': ts.plugin,
71-
},
74+
extends: [
75+
...ts.configs.recommendedTypeChecked,
76+
// https://github.com/ember-cli/ember-addon-blueprint/issues/119
77+
{
78+
...ts.configs.eslintRecommended,
79+
files: undefined,
80+
},
81+
ember.configs.gts,
82+
],
7283
},
7384
{
7485
files: ['src/**/*'],

package.json

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,31 @@
2424
"#src/*": "./src/*"
2525
},
2626
"exports": {
27-
".": "./dist/index.js",
27+
".": {
28+
"types": "./declarations/index.d.ts",
29+
"default": "./dist/index.js"
30+
},
2831
"./addon-main.js": "./addon-main.cjs",
29-
"./components/*.js": "./dist/components/*.js",
30-
"./components/*": "./dist/components/*.js",
31-
"./services/*.js": "./dist/services/*.js",
32-
"./services/*": "./dist/services/*.js",
33-
"./utils/*.js": "./dist/utils/*.js",
34-
"./utils/*": "./dist/utils/*.js",
35-
"./test-support": "./dist/test-support/index.js",
36-
"./test-support/*.js": "./dist/test-support/*.js",
37-
"./test-support/*": "./dist/test-support/*.js",
32+
"./components/*": {
33+
"types": "./declarations/components/*.d.ts",
34+
"default": "./dist/components/*.js"
35+
},
36+
"./services/*": {
37+
"types": "./declarations/services/*.d.ts",
38+
"default": "./dist/services/*.js"
39+
},
40+
"./utils/*": {
41+
"types": "./declarations/utils/*.d.ts",
42+
"default": "./dist/utils/*.js"
43+
},
44+
"./test-support": {
45+
"types": "./declarations/test-support/index.d.ts",
46+
"default": "./dist/test-support/index.js"
47+
},
48+
"./test-support/*": {
49+
"types": "./declarations/test-support/*.d.ts",
50+
"default": "./dist/test-support/*.js"
51+
},
3852
"./styles/ember-drag-sort.css": "./dist/styles/ember-drag-sort.css"
3953
},
4054
"files": [
@@ -81,6 +95,8 @@
8195
"@embroider/vite": "^1.1.5",
8296
"@eslint/js": "^9.17.0",
8397
"@glimmer/component": "^2.0.0",
98+
"@glint/ember-tsc": "^1.5.0",
99+
"@glint/template": "^1.7.7",
84100
"@rollup/plugin-babel": "^6.0.4",
85101
"babel-plugin-ember-template-compilation": "^4.0.0",
86102
"concurrently": "^9.0.1",

0 commit comments

Comments
 (0)