Merge branch 'main' into mn/fix/expose-all-module-resolutions

microsoft · Dec 22, 2024 · 28e5a43 · 28e5a43
2 parents f7512b8 + a4b088e
commit 28e5a43
Show file tree

Hide file tree

Showing 6 changed files with 385 additions and 179 deletions.
diff --git a/.azure-pipelines/publish-nightly.yml b/.azure-pipelines/publish-nightly.yml
@@ -70,6 +70,7 @@ extends:
         publishRequiresApproval: false
 
       - name: monaco-editor
+        dependsOn: monaco-editor-core
         workingDirectory: $(Build.SourcesDirectory)/out/monaco-editor
         testPlatforms: []
         skipAPIScan: true # package build requires Linux

diff --git a/.azure-pipelines/publish-stable.yml b/.azure-pipelines/publish-stable.yml
@@ -54,6 +54,7 @@ extends:
         publishRequiresApproval: false
 
       - name: monaco-editor
+        dependsOn: monaco-editor-core
         workingDirectory: $(Build.SourcesDirectory)/out/monaco-editor
         testPlatforms: []
         skipAPIScan: true # package build requires Linux
@@ -69,6 +70,7 @@ extends:
         publishRequiresApproval: false
 
       - name: monaco-editor-webpack-plugin
+        dependsOn: monaco-editor
         workingDirectory: $(Build.SourcesDirectory)/webpack-plugin
         testPlatforms: []
         packagePlatform: Windows

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
 		"playwright": "^1.32.2",
 		"prettier": "^2.5.1",
 		"pretty-quick": "^3.1.3",
-		"requirejs": "^2.3.6",
+		"requirejs": "^2.3.7",
 		"shelljs": "^0.8.5",
 		"style-loader": "^3.3.1",
 		"terser": "^5.14.2",