mirror of
https://github.com/microsoft/monaco-editor.git
synced 2025-12-22 23:13:02 +01:00
This commit is contained in:
parent
2a3d33900c
commit
0fb1b5ae89
2 changed files with 34 additions and 0 deletions
|
|
@ -46,8 +46,26 @@ async function prepareMonacoEditorRelease(monacoEditorCoreVersion: string) {
|
||||||
const packageJson = JSON.parse(
|
const packageJson = JSON.parse(
|
||||||
await readFile(monacoEditorPackageJsonPath, { encoding: 'utf-8' })
|
await readFile(monacoEditorPackageJsonPath, { encoding: 'utf-8' })
|
||||||
) as PackageJson;
|
) as PackageJson;
|
||||||
|
|
||||||
packageJson.version = monacoEditorCoreVersion;
|
packageJson.version = monacoEditorCoreVersion;
|
||||||
packageJson.devDependencies['monaco-editor-core'] = monacoEditorCoreVersion;
|
packageJson.devDependencies['monaco-editor-core'] = monacoEditorCoreVersion;
|
||||||
|
|
||||||
|
const monacoEditorCorePackageJson = JSON.parse(
|
||||||
|
await readFile(monacoEditorCorePackageJsonPath, { encoding: 'utf-8' })
|
||||||
|
) as PackageJson;
|
||||||
|
|
||||||
|
if (monacoEditorCorePackageJson.dependencies) {
|
||||||
|
if (!packageJson.dependencies) {
|
||||||
|
packageJson.dependencies = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
objectMergeThrowIfSet(
|
||||||
|
packageJson.dependencies,
|
||||||
|
monacoEditorCorePackageJson.dependencies,
|
||||||
|
'dependencies'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
await writeJsonFile(monacoEditorPackageJsonPath, packageJson);
|
await writeJsonFile(monacoEditorPackageJsonPath, packageJson);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -81,4 +99,19 @@ async function prepareMonacoEditorRelease(monacoEditorCoreVersion: string) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function objectMergeThrowIfSet(
|
||||||
|
target: Record<string, any>,
|
||||||
|
source: Record<string, any>,
|
||||||
|
fieldName: string
|
||||||
|
): void {
|
||||||
|
for (const [key, value] of Object.entries(source)) {
|
||||||
|
if (key in target) {
|
||||||
|
throw new Error(
|
||||||
|
`Cannot merge ${fieldName}: property '${key}' already exists in target with value '${target[key]}', would be overridden with '${value}'`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
target[key] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
prepareMonacoEditorReleaseStableOrNightly();
|
prepareMonacoEditorReleaseStableOrNightly();
|
||||||
|
|
|
||||||
|
|
@ -92,4 +92,5 @@ export interface PackageJson {
|
||||||
vscodeCommitId?: string;
|
vscodeCommitId?: string;
|
||||||
monacoCommitId?: string;
|
monacoCommitId?: string;
|
||||||
devDependencies: Record<string, string>;
|
devDependencies: Record<string, string>;
|
||||||
|
dependencies?: Record<string, string>;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue