Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,25 @@
"private": true,
"name": "@fof/user-directory",
"prettier": "@flarum/prettier-config",
"dependencies": {
"devDependencies": {
"@flarum/prettier-config": "^1.0.0",
"flarum-tsconfig": "^2.0.0",
"flarum-webpack-config": "^3.0.0",
"webpack": "^5.65.0",
"webpack-cli": "^5.0"
},
"devDependencies": {
"prettier": "^3.0.2"
"webpack-cli": "^5.0",
"prettier": "^3.3.3",
"typescript-coverage-report": "^0.6.1"
},
"scripts": {
"dev": "webpack --mode development --watch",
"build": "webpack --mode production",
"analyze": "cross-env ANALYZER=true npm run build",
"format": "prettier --write src",
"format-check": "prettier --check src"
"format-check": "prettier --check src",
"clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
"build-typings": "npm run clean-typings && ([ -e src/@types ] && cp -r src/@types dist-typings/@types || true) && tsc && npm run post-build-typings",
"post-build-typings": "find dist-typings -type f -name '*.d.ts' -print0 | xargs -0 sed -i 's,../src/@types,@types,g'",
"check-typings": "tsc --noEmit --emitDeclarationOnly false",
"check-typings-coverage": "typescript-coverage-report"
}
}
}
2 changes: 1 addition & 1 deletion js/src/admin/extend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default [
type: 'boolean',
}))
.setting(() => {
const sortOptions = {
const sortOptions: Record<string, string | any[]> = {
'': app.translator.trans('fof-user-directory.lib.sort.not_specified'),
};

Expand Down
22 changes: 11 additions & 11 deletions js/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
// Use Flarum's tsconfig as a starting point
"extends": "flarum-tsconfig",
// This will match all .ts, .tsx, .d.ts, .js, .jsx files
"include": ["src/**/*"],
"compilerOptions": {
// This will output typings to `dist-typings`
"declarationDir": "./dist-typings",
"baseUrl": ".",
"paths": {
"flarum/*": ["../vendor/flarum/core/js/dist-typings/*"]
}
"extends": "flarum-tsconfig",
"include": [
"src/**/*",
"../vendor/flarum/core/js/dist-typings/@types/**/*",
],
"compilerOptions": {
"declarationDir": "./dist-typings",
"baseUrl": ".",
"paths": {
"flarum/*": ["../vendor/flarum/core/js/dist-typings/*"]
}
}
}
Loading
Loading