Skip to content

Commit f1dd440

Browse files
committed
chore: add eslint-plugin-sort and eslint-plugin-prettier
1 parent e667e34 commit f1dd440

32 files changed

+214
-106
lines changed

eslint.config.mjs

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,36 @@
11
import unjs from 'eslint-config-unjs'
2+
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
3+
import sort from 'eslint-plugin-sort'
24

3-
export default unjs({
4-
ignores: [
5-
// ignore paths
6-
'coverage',
7-
'dist',
8-
'node_modules',
9-
'tmp',
10-
],
11-
rules: {
12-
// rule overrides
13-
'@typescript-eslint/no-require-imports': 'off',
14-
'unicorn/no-array-reduce': 'off',
15-
'unicorn/no-process-exit': 'off',
16-
'unicorn/prefer-top-level-await': 'off',
5+
export default unjs(
6+
{
7+
ignores: [
8+
// ignore paths
9+
'coverage',
10+
'dist',
11+
'node_modules',
12+
'tmp',
13+
],
14+
markdown: {
15+
rules: {
16+
// markdown rule overrides
17+
},
18+
},
19+
rules: {
20+
// rule overrides
21+
'@typescript-eslint/no-require-imports': 'off',
22+
'unicorn/no-array-reduce': 'off',
23+
'unicorn/no-process-exit': 'off',
24+
'unicorn/prefer-top-level-await': 'off',
25+
},
1726
},
18-
markdown: {
27+
sort.configs['flat/recommended'],
28+
{
1929
rules: {
20-
// markdown rule overrides
30+
'sort/string-enums': 'error',
31+
'sort/string-unions': 'error',
32+
'sort/type-properties': 'error',
2133
},
2234
},
23-
})
35+
eslintPluginPrettierRecommended,
36+
)

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
"dev": "vitest dev",
4040
"docker:build": "docker build -t create-solana-dapp:latest .",
4141
"docker:run": "docker run --rm --name create-solana-dapp -v \"${PWD}/dist:/workspace/dist\" -it create-solana-dapp:latest",
42-
"lint": "eslint . && prettier -c .",
43-
"lint:fix": "automd && eslint . --fix && prettier -w .",
42+
"lint": "eslint .",
43+
"lint:fix": "automd && eslint . --fix",
4444
"prepublishOnly": "pnpm pkg delete devDependencies",
4545
"publish-impl": "npm view $npm_package_name@$npm_package_version > /dev/null 2>&1 || pnpm publish --tag ${PUBLISH_TAG:-canary} --access public --no-git-checks",
4646
"publish-packages": "pnpm prepublishOnly && pnpm publish-impl",
@@ -57,7 +57,10 @@
5757
"@vitest/coverage-v8": "^3.2.4",
5858
"automd": "^0.4.0",
5959
"eslint": "^9.35.0",
60+
"eslint-config-prettier": "^10.1.8",
6061
"eslint-config-unjs": "^0.5.0",
62+
"eslint-plugin-prettier": "^5.5.4",
63+
"eslint-plugin-sort": "^4.0.0",
6164
"memfs": "^4.39.0",
6265
"mock-fs": "^5.5.0",
6366
"prettier": "^3.6.2",

pnpm-lock.yaml

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

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export async function main(argv: string[]) {
3232
const instructions = await createApp(args)
3333

3434
note(
35-
finalNote({ ...args, target: args.targetDirectory.replace(process.cwd(), '.'), instructions }),
35+
finalNote({ ...args, instructions, target: args.targetDirectory.replace(process.cwd(), '.') }),
3636
'Installation successful',
3737
)
3838

src/utils/create-app-task-clone-template.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Task, taskFail } from './vendor/clack-tasks'
77

88
export function createAppTaskCloneTemplate(args: GetArgsResult): Task {
99
return {
10-
title: 'Cloning template',
1110
task: async (result) => {
1211
const exists = existsSync(args.targetDirectory)
1312

@@ -36,5 +35,6 @@ export function createAppTaskCloneTemplate(args: GetArgsResult): Task {
3635
taskFail(`init: Error cloning the template: ${error}`)
3736
}
3837
},
38+
title: 'Cloning template',
3939
}
4040
}

src/utils/create-app-task-initialize-git.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { initializeGitRepo } from './vendor/git'
66
export function createAppTaskInitializeGit(args: GetArgsResult): Task {
77
return {
88
enabled: !args.skipGit,
9-
title: 'Initializing git',
109
task: async (result) => {
1110
try {
1211
if (args.verbose) {
@@ -23,5 +22,6 @@ export function createAppTaskInitializeGit(args: GetArgsResult): Task {
2322
taskFail(`init: Error initializing git: ${error}`)
2423
}
2524
},
25+
title: 'Initializing git',
2626
}
2727
}

src/utils/create-app-task-install-dependencies.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function createAppTaskInstallDependencies(args: GetArgsResult): Task {
1111
const { install, lockFile } = getPackageManagerCommand(pm, args.verbose)
1212
return {
1313
enabled: !args.skipInstall,
14-
title: `Installing via ${pm}`,
1514
task: async (result) => {
1615
if (args.verbose) {
1716
log.warn(`Installing via ${pm}`)
@@ -38,5 +37,6 @@ export function createAppTaskInstallDependencies(args: GetArgsResult): Task {
3837
taskFail(`init: Error installing dependencies: ${error}`)
3938
}
4039
},
40+
title: `Installing via ${pm}`,
4141
}
4242
}

src/utils/create-app-task-run-init-script.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { Task, taskFail } from './vendor/clack-tasks'
1111
export function createAppTaskRunInitScript(args: GetArgsResult): Task {
1212
return {
1313
enabled: !args.skipInit,
14-
title: 'Running init script',
1514
task: async (result) => {
1615
try {
1716
const { contents } = getPackageJson(args.targetDirectory)
@@ -32,10 +31,11 @@ export function createAppTaskRunInitScript(args: GetArgsResult): Task {
3231
.map((msg) => msg.replace('{pm}', args.packageManager))
3332

3433
initScriptDelete(args)
35-
return result({ message: 'Init script done', instructions })
34+
return result({ instructions, message: 'Init script done' })
3635
} catch (error) {
3736
taskFail(`Error running init script: ${error}`)
3837
}
3938
},
39+
title: 'Running init script',
4040
}
4141
}

src/utils/fetch-template-data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { MenuConfig, MenuItem, TemplateJsonTemplate } from '@beeman/repokit'
2-
import { getTemplateGroupsFromUrl } from './get-template-groups-from-url'
32
import { getMenuItemsFromTemplateGroups } from './get-menu-items-from-template-groups'
3+
import { getTemplateGroupsFromUrl } from './get-template-groups-from-url'
44
import { getTemplatesFromItems } from './get-templates-from-items'
55

66
export async function fetchTemplateData({

src/utils/final-note.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { getPackageJson } from './get-package-json'
44
import { getStartScript } from './get-start-script'
55

66
export interface FinalNoteArgs extends GetArgsResult {
7-
target: string
87
instructions: string[]
8+
target: string
99
}
1010

1111
export function finalNote(args: FinalNoteArgs): string {

0 commit comments

Comments
 (0)