Skip to content

Commit bdbcaeb

Browse files
pplancqpplancq
committed
chore(dev-tools): standardize import quotes and formatting
1 parent bf595cd commit bdbcaeb

46 files changed

Lines changed: 487 additions & 499 deletions

Some content is hidden

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

‎package-lock.json‎

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

‎packages/commitlint-config/eslint.config.mjs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { defineConfig } from "@pplancq/eslint-config";
2+
import eslintConfigPrettier from "eslint-config-prettier/flat";
23

34
export default defineConfig({
4-
enablePrettier: "on",
55
extendConfig: [
6+
eslintConfigPrettier,
67
{
78
files: ["**/*.config.{js,cjs,mjs,ts,cts,mts}"],
89
rules: {

‎packages/commitlint-config/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"scripts": {
1313
"lint:eslint": "eslint \"**/*.{js,mjs}\"",
1414
"lint:eslint:fix": "eslint \"**/*.{js,mjs}\" --fix",
15-
"lint:prettier": "prettier \"**/*.!(js|mjs)\" --check --ignore-unknown",
16-
"lint:prettier:fix": "prettier \"**/*.!(js|mjs)\" --write --ignore-unknown"
15+
"lint:prettier": "prettier . --check --ignore-unknown",
16+
"lint:prettier:fix": "prettier . --write --ignore-unknown"
1717
},
1818
"files": [
1919
"bin",
@@ -41,7 +41,7 @@
4141
},
4242
"devDependencies": {
4343
"eslint": "^9.39.5",
44-
"eslint-plugin-prettier": "^5.5.6",
44+
"eslint-config-prettier": "^10.1.8",
4545
"lint-staged": "^17.2.0",
4646
"prettier": "^3.9.6"
4747
},
@@ -51,6 +51,6 @@
5151
"prettier": "@pplancq/prettier-config",
5252
"lint-staged": {
5353
"*.(js|mjs)": "eslint --fix",
54-
"*.!(js|mjs)": "prettier --write --ignore-unknown"
54+
"*": "prettier --write --ignore-unknown"
5555
}
5656
}

‎packages/create-react-app/eslint.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { defineConfig } from "@pplancq/eslint-config";
2+
import eslintConfigPrettier from "eslint-config-prettier/flat";
23

34
export default defineConfig({
4-
enablePrettier: "on",
55
enableVitest: true,
66
extendConfig: [
7+
eslintConfigPrettier,
78
{
89
ignores: ["dist"],
910
},

‎packages/create-react-app/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"test:watch": "vitest",
2525
"lint:eslint": "eslint \"**/*.{js,mjs,ts}\"",
2626
"lint:eslint:fix": "eslint \"**/*.{js,mjs,ts}\" --fix",
27-
"lint:prettier": "prettier \"**/*.!(js|mjs|ts)\" --check --ignore-unknown",
28-
"lint:prettier:fix": "prettier \"**/*.!(js|mjs|ts)\" --write --ignore-unknown",
27+
"lint:prettier": "prettier . --check --ignore-unknown",
28+
"lint:prettier:fix": "prettier . --write --ignore-unknown",
2929
"lint:tsc": "tsc --noEmit",
3030
"prepublishOnly": "npm run build"
3131
},
@@ -47,7 +47,7 @@
4747
"@vitest/coverage-v8": "^4.1.10",
4848
"commander": "^15.0.0",
4949
"eslint": "^9.39.5",
50-
"eslint-plugin-prettier": "^5.5.6",
50+
"eslint-config-prettier": "^10.1.8",
5151
"lint-staged": "^17.2.0",
5252
"picocolors": "^1.1.1",
5353
"prettier": "^3.9.6",
@@ -63,6 +63,6 @@
6363
"lint-staged": {
6464
"*.(js|mjs|ts)": "eslint --fix",
6565
"*.ts": "tsc-files --noEmit",
66-
"*.!(js|mjs|ts)": "prettier --write --ignore-unknown"
66+
"*": "prettier --write --ignore-unknown"
6767
}
6868
}

‎packages/create-react-app/src/steps/getInteractiveArgs.ts‎

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -22,58 +22,56 @@ export const getInteractiveArgs = async ({
2222
skipDepInstall,
2323
skipGitInit,
2424
template,
25-
}: InteractiveArgs): Promise<InteractiveArgsResult> => {
26-
return {
27-
projectName:
28-
projectName ||
25+
}: InteractiveArgs): Promise<InteractiveArgsResult> => ({
26+
projectName:
27+
projectName ||
28+
checkCancel(
29+
await text({
30+
message: "What is the name of your project?",
31+
placeholder: "my-project",
32+
validate: validateProjectName,
33+
}),
34+
).toString(),
35+
skipDepInstall:
36+
skipDepInstall ||
37+
Boolean(
2938
checkCancel(
30-
await text({
31-
message: "What is the name of your project?",
32-
placeholder: "my-project",
33-
validate: validateProjectName,
34-
}),
35-
).toString(),
36-
skipDepInstall:
37-
skipDepInstall ||
38-
Boolean(
39-
checkCancel(
40-
await confirm({ message: "Do you want to skip installing dependencies (npm install)?", initialValue: false }),
41-
),
39+
await confirm({ message: "Do you want to skip installing dependencies (npm install)?", initialValue: false }),
4240
),
43-
skipGitInit:
44-
skipGitInit ||
45-
Boolean(
46-
checkCancel(
47-
await confirm({ message: "Do you want to skip initializing a git repository?", initialValue: false }),
48-
),
49-
),
50-
template:
51-
template ||
41+
),
42+
skipGitInit:
43+
skipGitInit ||
44+
Boolean(
5245
checkCancel(
53-
(
54-
await group<{ useCustomTemplate: boolean; template: string }>({
55-
useCustomTemplate: async () =>
56-
Boolean(
57-
await confirm({
58-
message: "Do you want to use a custom template?",
59-
initialValue: false,
60-
}),
61-
),
62-
template: async ({ results }) => {
63-
if (!results.useCustomTemplate) {
64-
return "@pplancq/react-template";
65-
}
66-
67-
return (
68-
await text({
69-
message: "Enter the custom template name (e.g., @pplancq/react-template):",
70-
placeholder: "@pplancq/react-template",
71-
validate: validateTemplateName,
72-
})
73-
).toString();
74-
},
75-
})
76-
).template,
46+
await confirm({ message: "Do you want to skip initializing a git repository?", initialValue: false }),
7747
),
78-
};
79-
};
48+
),
49+
template:
50+
template ||
51+
checkCancel(
52+
(
53+
await group<{ useCustomTemplate: boolean; template: string }>({
54+
useCustomTemplate: async () =>
55+
Boolean(
56+
await confirm({
57+
message: "Do you want to use a custom template?",
58+
initialValue: false,
59+
}),
60+
),
61+
template: async ({ results }) => {
62+
if (!results.useCustomTemplate) {
63+
return "@pplancq/react-template";
64+
}
65+
66+
return (
67+
await text({
68+
message: "Enter the custom template name (e.g., @pplancq/react-template):",
69+
placeholder: "@pplancq/react-template",
70+
validate: validateTemplateName,
71+
})
72+
).toString();
73+
},
74+
})
75+
).template,
76+
),
77+
});

‎packages/eslint-config/package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
},
5353
"peerDependencies": {
5454
"eslint": "^9.14.0",
55-
"eslint-plugin-prettier": "^5.0.1",
5655
"prettier": "^3.2.5"
5756
},
5857
"peerDependenciesMeta": {
@@ -65,7 +64,7 @@
6564
},
6665
"devDependencies": {
6766
"eslint": "^9.39.5",
68-
"eslint-config-prettier": "^10.0.0",
67+
"eslint-plugin-prettier": "^5.5.6",
6968
"lint-staged": "^17.2.0",
7069
"prettier": "^3.9.6"
7170
},
@@ -75,6 +74,6 @@
7574
"prettier": "@pplancq/prettier-config",
7675
"lint-staged": {
7776
"*.(js|mjs)": "eslint --fix",
78-
"*.!(js|mjs)": "prettier --write --ignore-unknown"
77+
"*": "prettier --write --ignore-unknown"
7978
}
8079
}

‎packages/eslint-config/rules/prettier.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// eslint-disable-next-line import/no-extraneous-dependencies
12
import prettierPlugin from "eslint-plugin-prettier";
23

34
export const prettierRules = {

‎packages/nx-release-plugin/.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
dist
22
node_modules
33
CHANGELOG.md
4+
coverage

‎packages/nx-release-plugin/eslint.config.mjs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { defineConfig } from "@pplancq/eslint-config";
2+
import eslintConfigPrettier from "eslint-config-prettier/flat";
23

34
export default defineConfig({
4-
enablePrettier: "on",
55
extendConfig: [
6+
eslintConfigPrettier,
67
{
78
ignores: ["dist/", "node_modules/"],
89
},

0 commit comments

Comments
 (0)