diff --git a/.vscode/launch.json b/.vscode/launch.json index ffbbe651fcef..38dfc5953f02 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -180,6 +180,23 @@ "type": "node", "args": ["test-only-filter", "--all"], }, + { + "name": "flub bump build-tools", + "program": "${workspaceFolder}/build-tools/packages/build-cli/bin/dev.js", + "cwd": "${workspaceFolder}", + "request": "launch", + "skipFiles": ["/**"], + "type": "node", + "args": [ + "bump", + "build-tools", + "-t", + "patch", + "--verbose", + "--no-commit", + "--no-install", + ], + }, { "name": "flub bump deps", "program": "${workspaceFolder}/build-tools/packages/build-cli/bin/dev.js", diff --git a/fluidBuild.config.cjs b/fluidBuild.config.cjs index c90e80312ea9..38df681f5f15 100644 --- a/fluidBuild.config.cjs +++ b/fluidBuild.config.cjs @@ -16,7 +16,7 @@ const tscDependsOn = ["^tsc", "^api", "build:genver", "ts2esm"]; * See https://github.com/microsoft/FluidFramework/blob/main/build-tools/packages/build-tools/src/common/fluidTaskDefinitions.ts * for details on the task and dependency definition format. * - * @type {import("@fluidframework/build-tools").IFluidBuildConfig} + * @type {import("@fluidframework/build-tools").IFluidBuildConfig & import("@fluid-tools/build-cli").FlubConfig} */ module.exports = { version: 1, @@ -167,19 +167,15 @@ module.exports = { }, "build-tools": { directory: "build-tools", - defaultInterdependencyRange: "workspace:~", }, "server": { directory: "server/routerlicious", - defaultInterdependencyRange: "workspace:~", }, "gitrest": { directory: "server/gitrest", - defaultInterdependencyRange: "^", }, "historian": { directory: "server/historian", - defaultInterdependencyRange: "^", }, // Independent packages @@ -534,6 +530,18 @@ module.exports = { }, }, + // `flub bump` config. These settings influence `flub bump` behavior for a release group. These settings can be + // overridden usig explicit CLI flags like `--interdependencyRange`. + bump: { + defaultInterdependencyRange: { + "client": "workspace:~", + "build-tools": "workspace:~", + "server": "workspace:~", + "gitrest": "^", + "historian": "^", + }, + }, + // This defines the branch release types for type tests. It applies only to the client release group. Settings for // other release groups is in their root fluid-build config. branchReleaseTypes: {