From 087a4e06800efdfdcf14f787196d5263cc4c61cc Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Wed, 13 Nov 2024 13:19:00 -0800 Subject: [PATCH] include marketplace extensions in the "non-native" part --- build/gulpfile.extensions.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js index 60375a7a9cf48..2374a92c5f520 100644 --- a/build/gulpfile.extensions.js +++ b/build/gulpfile.extensions.js @@ -234,11 +234,18 @@ exports.compileExtensionMediaBuildTask = compileExtensionMediaBuildTask; * Cleans the build directory for extensions */ const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions')); +/** + * brings in the marketplace extensions for the build + */ +const bundleMarketplaceExtensionsBuildTask = task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))); /** * Compiles the non-native extensions for the build * @note this does not clean the directory ahead of it. See {@link cleanExtensionsBuildTask} for that. */ -const compileNonNativeExtensionsBuildTask = task.define('compile-non-native-extensions-build', () => ext.packageLocalNonNativeExtensionsStream().pipe(gulp.dest('.build'))); +const compileNonNativeExtensionsBuildTask = task.define('compile-non-native-extensions-build', task.series( + bundleMarketplaceExtensionsBuildTask, + task.define('bundle-non-native-extensions-build', () => ext.packageLocalNonNativeExtensionsStream().pipe(gulp.dest('.build'))) +)); gulp.task(compileNonNativeExtensionsBuildTask); /** * Compiles the native extensions for the build @@ -253,7 +260,7 @@ gulp.task(compileNativeExtensionsBuildTask); */ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series( cleanExtensionsBuildTask, - task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))), + bundleMarketplaceExtensionsBuildTask, task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false, false).pipe(gulp.dest('.build'))), )); gulp.task(compileExtensionsBuildTask); @@ -264,7 +271,7 @@ gulp.task(task.define('extensions-ci', task.series(compileNonNativeExtensionsBui const compileExtensionsBuildPullRequestTask = task.define('compile-extensions-build-pr', task.series( cleanExtensionsBuildTask, - task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))), + bundleMarketplaceExtensionsBuildTask, task.define('bundle-extensions-build-pr', () => ext.packageLocalExtensionsStream(false, true).pipe(gulp.dest('.build'))), ));