diff --git a/scripts/ci/build-monaco-editor-pkg.ts b/scripts/ci/build-monaco-editor-pkg.ts index 59e31d4e..f04b2177 100644 --- a/scripts/ci/build-monaco-editor-pkg.ts +++ b/scripts/ci/build-monaco-editor-pkg.ts @@ -43,36 +43,32 @@ async function prepareMonacoEditorRelease(monacoEditorCoreVersion: string) { }); await group('Set Version & Update monaco-editor-core Version', async () => { - const packageJson = JSON.parse( - await readFile(monacoEditorPackageJsonPath, { encoding: 'utf-8' }) - ) as PackageJson; - + const packageJson = JSON.parse(await readFile(monacoEditorPackageJsonPath, { encoding: 'utf-8' })) as PackageJson; packageJson.version = monacoEditorCoreVersion; packageJson.devDependencies['monaco-editor-core'] = monacoEditorCoreVersion; + await writeJsonFile(monacoEditorPackageJsonPath, packageJson); + }); - const monacoEditorCorePackageJson = JSON.parse( - await readFile(monacoEditorCorePackageJsonPath, { encoding: 'utf-8' }) - ) as PackageJson; + await group('npm install to pick up monaco-editor-core', async () => { + await run('npm install', { cwd: rootPath }); + }); + await group('Pick up monaco-editor-core dependencies for CVE tracking', async () => { + const packageJson = JSON.parse(await readFile(monacoEditorPackageJsonPath, { encoding: 'utf-8' })) as PackageJson; + 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 group('npm install to pick up monaco-editor-core', async () => { - await run('npm install', { cwd: rootPath }); - }); - await group('Setting vscode commitId from monaco-editor-core', async () => { const monacoEditorCorePackageJson = JSON.parse( await readFile(monacoEditorCorePackageJsonPath, { encoding: 'utf-8' })