diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000000..793a923d16eb --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Prettier 3.4.2 +9b0340a09276f93c054d705d1b9a5f24cc5dbc97 \ No newline at end of file diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 67969af2951a..337b55ba6e73 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,17 +23,25 @@ concurrency: jobs: prettier: - name: Format with Prettier + name: Run prettier check runs-on: ubuntu-22.04 timeout-minutes: 5 steps: - name: Checkout repo uses: actions/checkout@v4 - - name: Run prettier with actionsx/prettier - uses: actionsx/prettier@v3 + - name: Install Node.js + uses: actions/setup-node@v4 with: - args: --check --log-level=warn . + node-version-file: .node-version + cache: npm + cache-dependency-path: | + package-lock.json + test/package-lock.json + + - run: SKIP_SUBMODULE_DEPS=1 npm ci + + - run: npx prettier --check . doctoc: name: Doctoc markdown files diff --git a/package-lock.json b/package-lock.json index 44a1ba0991f0..3779af901516 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "globals": "^15.10.0", - "prettier": "^3.0.3", + "prettier": "3.4.2", "prettier-plugin-sh": "^0.14.0", "ts-node": "^10.9.1", "typescript": "^5.6.2", @@ -4643,10 +4643,11 @@ } }, "node_modules/prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, diff --git a/package.json b/package.json index d3484172f8bd..e91feacc035e 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-prettier": "^5.0.0", "globals": "^15.10.0", - "prettier": "^3.0.3", + "prettier": "3.4.2", "prettier-plugin-sh": "^0.14.0", "ts-node": "^10.9.1", "typescript": "^5.6.2", diff --git a/src/node/cli.ts b/src/node/cli.ts index 6320c2025239..9eb6e5163e8a 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -118,18 +118,18 @@ interface Option { type OptionType = T extends boolean ? "boolean" : T extends OptionalString - ? typeof OptionalString - : T extends LogLevel - ? typeof LogLevel - : T extends AuthType - ? typeof AuthType - : T extends number - ? "number" - : T extends string - ? "string" - : T extends string[] - ? "string[]" - : "unknown" + ? typeof OptionalString + : T extends LogLevel + ? typeof LogLevel + : T extends AuthType + ? typeof AuthType + : T extends number + ? "number" + : T extends string + ? "string" + : T extends string[] + ? "string[]" + : "unknown" export type Options = { [P in keyof T]: Option>