From 3f538fd7b5e84e1f4a5abddae6e71f822d98b4fd Mon Sep 17 00:00:00 2001 From: Philip Heltweg Date: Mon, 12 Feb 2024 13:29:11 +0100 Subject: [PATCH 1/2] ci: :green_heart: Fixed publishing to npm failing because of peerDependencies --- .../scripts/monaco-editor/delete-vscode-peer-dependency.mjs | 6 ++++-- tools/scripts/monaco-editor/relax-react-version.mjs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/scripts/monaco-editor/delete-vscode-peer-dependency.mjs b/tools/scripts/monaco-editor/delete-vscode-peer-dependency.mjs index 55168db4..1ecb838c 100644 --- a/tools/scripts/monaco-editor/delete-vscode-peer-dependency.mjs +++ b/tools/scripts/monaco-editor/delete-vscode-peer-dependency.mjs @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0-only -import {getOutputPath, parsePackageJson, writePackageJson} from "../shared-util.mjs"; +import { getOutputPath, parsePackageJson, writePackageJson } from "../shared-util.mjs"; // Executing this script: node path/to/delete-vscode-peer-dependency.mjs {projectName} const [, , projectName] = process.argv; @@ -22,6 +22,8 @@ const packageJson = parsePackageJson(); Since this package is a peer dependency of `monaco-languageclient` anyways, we can simply remove the entry for `vscode` to fix the problem. */ -delete packageJson.peerDependencies.vscode; +if (packageJson.peerDependencies) { + delete packageJson.peerDependencies.vscode; +} writePackageJson(packageJson); \ No newline at end of file diff --git a/tools/scripts/monaco-editor/relax-react-version.mjs b/tools/scripts/monaco-editor/relax-react-version.mjs index 23ce28c6..b84a1766 100644 --- a/tools/scripts/monaco-editor/relax-react-version.mjs +++ b/tools/scripts/monaco-editor/relax-react-version.mjs @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0-only -import {getOutputPath, parsePackageJson, writePackageJson} from "../shared-util.mjs"; +import { getOutputPath, parsePackageJson, writePackageJson } from "../shared-util.mjs"; // Executing this script: node path/to/relax-react-version.mjs {projectName} const [, , projectName] = process.argv; @@ -11,6 +11,8 @@ process.chdir(getOutputPath(projectName)); const packageJson = parsePackageJson(); // By default, this value is set to the exact React version we are using. This makes it hard to use the package in environments where a different React version is present. -packageJson.peerDependencies.react = '>= 17'; +if (packageJson.peerDependencies) { + packageJson.peerDependencies.react = '>= 17'; +} writePackageJson(packageJson); \ No newline at end of file From c2ee0762a16660000053aaeaba0f32d65c1c806e Mon Sep 17 00:00:00 2001 From: Philip Heltweg Date: Mon, 12 Feb 2024 14:26:59 +0100 Subject: [PATCH 2/2] ci: :memo: Fixed wrong name for workflow run --- .github/workflows/check-paths-for-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-paths-for-windows.yaml b/.github/workflows/check-paths-for-windows.yaml index 74e2cc1f..0562f35b 100644 --- a/.github/workflows/check-paths-for-windows.yaml +++ b/.github/workflows/check-paths-for-windows.yaml @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -name: CI +name: Check paths for windows on: push: