From 8f740f789558db34b0a71d7d6f0b30ecc2d1f5ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 00:40:23 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump prettier from 3.0.3 to 3.1.0 Bumps [prettier](https://github.com/prettier/prettier) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.0.3...3.1.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e913a16a..9917c26b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "eslint-plugin-jest": "^27.6.0", "jest": "^29.7.0", "js-yaml": "^4.1.0", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "ts-jest": "^29.1.0", "typescript": "^5.2.2" } @@ -6462,9 +6462,9 @@ } }, "node_modules/prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", + "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -12388,9 +12388,9 @@ "dev": true }, "prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", + "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index acd33c1f..9a88226d 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "eslint-plugin-jest": "^27.6.0", "jest": "^29.7.0", "js-yaml": "^4.1.0", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "ts-jest": "^29.1.0", "typescript": "^5.2.2" } From 2657ef846a5fdf2962f3747a7507e11abe07cc45 Mon Sep 17 00:00:00 2001 From: Matteo Dell'Acqua <82184604+MatteoH2O1999@users.noreply.github.com> Date: Tue, 14 Nov 2023 10:37:27 +0100 Subject: [PATCH 2/2] Comply with prettier 3.1.0 --- src/builder/darwin.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/builder/darwin.ts b/src/builder/darwin.ts index e1b5345a..57941f93 100644 --- a/src/builder/darwin.ts +++ b/src/builder/darwin.ts @@ -189,12 +189,10 @@ export default class MacOSBuilder extends Builder { }); } this.sslPath = this.sslPath.trim(); - process.env[ - 'LDFLAGS' - ] += `-L${this.sslPath}/lib -L${zlibPath}/lib -L${readLinePath}/lib `; - process.env[ - 'CFLAGS' - ] += `-I${this.sslPath}/include -I${zlibPath}/include -I${readLinePath}/include `; + process.env['LDFLAGS'] += + `-L${this.sslPath}/lib -L${zlibPath}/lib -L${readLinePath}/lib `; + process.env['CFLAGS'] += + `-I${this.sslPath}/include -I${zlibPath}/include -I${readLinePath}/include `; core.info(`OpenSSL path: ${this.sslPath}`); // Fix for Python 3.0 SVN version