diff --git a/package.json b/package.json index 2dfa8fba6..e951e570c 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.1.3", "lefthook": "^1.6.16", + "prettier": "3.3.2", "rollup": "3.21.0", "rollup-plugin-auto-external": "2.0.0", "tslib": "2.5.0", @@ -47,7 +48,6 @@ }, "dependencies": { "@changesets/cli": "^2.26.2", - "@trivago/prettier-plugin-sort-imports": "^4.3.0", "arg": "5.0.2", "chalk": "5.2.0", "execa": "7.1.1", @@ -55,9 +55,7 @@ "listr2": "^8.2.1", "merge-packages": "^0.1.6", "ncp": "2.0.0", - "pkg-install": "1.0.0", - "prettier": "3.3.2", - "prettier-plugin-solidity": "^1.3.1" + "pkg-install": "1.0.0" }, "packageManager": "yarn@3.5.0" } diff --git a/src/main.ts b/src/main.ts index 166bdcf91..e746b91ce 100644 --- a/src/main.ts +++ b/src/main.ts @@ -40,7 +40,7 @@ export async function createProject(options: Options) { task: () => installPackages(targetDirectory), skip: () => { if (!options.install) { - return "Manually skipped"; + return "Manually skipped, since `--skip-install` flag was passed"; } return false; }, @@ -50,7 +50,7 @@ export async function createProject(options: Options) { task: () => prettierFormat(targetDirectory), skip: () => { if (!options.install) { - return "`yarn install` was skipped"; + return "Can't use source prettier, since `yarn install` was skipped"; } return false; }, diff --git a/src/types.ts b/src/types.ts index 2b75ac149..4dea36c57 100644 --- a/src/types.ts +++ b/src/types.ts @@ -9,7 +9,7 @@ export type ExternalExtension = { type BaseOptions = { project: string | null; - install: boolean | null; + install: boolean; dev: boolean; externalExtension: ExternalExtension | ExternalExtensionNameDev | null; solidityFramework: SolidityFramework | "none" | null; diff --git a/src/utils/parse-arguments-into-options.ts b/src/utils/parse-arguments-into-options.ts index 0a6f9ec7f..40345535f 100644 --- a/src/utils/parse-arguments-into-options.ts +++ b/src/utils/parse-arguments-into-options.ts @@ -54,9 +54,6 @@ const validateExternalExtension = async ( export async function parseArgumentsIntoOptions(rawArgs: Args): Promise { const args = arg( { - "--install": Boolean, - "-i": "--install", - "--skip-install": Boolean, "--skip": "--skip-install", @@ -76,15 +73,8 @@ export async function parseArgumentsIntoOptions(rawArgs: Args): Promise=2.3.0" - checksum: 286bf3b5899d7fad66e49c78ebac164bacfbf419f874a932ed99e491d97d77e91fa03ca068197939d3696ba7991db9e5258390dd42dee8d2184fa8c2e11921e4 - languageName: node - linkType: hard - "prettier@npm:3.3.2": version: 3.3.2 resolution: "prettier@npm:3.3.2" @@ -4577,7 +4308,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.5.4, semver@npm:^7.6.0": +"semver@npm:^7.6.0": version: 7.6.2 resolution: "semver@npm:7.6.2" bin: @@ -4714,13 +4445,6 @@ __metadata: languageName: node linkType: hard -"solidity-comments-extractor@npm:^0.0.8": - version: 0.0.8 - resolution: "solidity-comments-extractor@npm:0.0.8" - checksum: ad025fc968e2d744b4270710c2f7f55b43d8046ab3f155fd880a7768d6fd163a93ea98f62be3b1115a29ba815bd8b5736bb5ffd1feff79083eca1bf273108d07 - languageName: node - linkType: hard - "sort-object-keys@npm:^1.1.3": version: 1.1.3 resolution: "sort-object-keys@npm:1.1.3" @@ -4744,13 +4468,6 @@ __metadata: languageName: node linkType: hard -"source-map@npm:^0.5.0": - version: 0.5.7 - resolution: "source-map@npm:0.5.7" - checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d - languageName: node - linkType: hard - "spawndamnit@npm:^2.0.0": version: 2.0.0 resolution: "spawndamnit@npm:2.0.0" @@ -5047,13 +4764,6 @@ __metadata: languageName: node linkType: hard -"to-fast-properties@npm:^2.0.0": - version: 2.0.0 - resolution: "to-fast-properties@npm:2.0.0" - checksum: be2de62fe58ead94e3e592680052683b1ec986c72d589e7b21e5697f8744cdbf48c266fa72f6c15932894c10187b5f54573a3bcf7da0bfd964d5caf23d436168 - languageName: node - linkType: hard - "to-regex-range@npm:^5.0.1": version: 5.0.1 resolution: "to-regex-range@npm:5.0.1"