merge conflicts

package.json

@@ -63,8 +63,8 @@
     "@fullcalendar/interaction": "^4.1.0",
     "@fullcalendar/react": "^4.1.0",
     "@fullcalendar/timegrid": "^4.1.0",
-    "azure-devops-extension-api": "~1.158.0",
-    "azure-devops-extension-sdk": "~2.0.11",
+    "azure-devops-extension-api": "^1.158.0",
+    "azure-devops-extension-sdk": "^2.0.11",
     "azure-devops-ui": "~1.159.0",
     "moment": "^2.29.4",
     "react": "~16.8.1",

src/AddEditDaysOffDialog.tsx

@@ -1,7 +1,7 @@
 import React = require("react");
 
 import { TeamMember } from "azure-devops-extension-api/WebApi/WebApi";
-import { TeamSettingsIteration } from "azure-devops-extension-api/work";
+import { TeamSettingsIteration } from "azure-devops-extension-api/work/Work";
 
 import { getUser } from "azure-devops-extension-sdk";
 

src/VSOCapacityEventSource.ts

@@ -1,23 +1,13 @@
 import { getClient } from "azure-devops-extension-api";
 import { TeamContext } from "azure-devops-extension-api/Core";
-import {
-    CapacityPatch,
-    TeamMemberCapacity,
-    TeamSettingsDaysOff,
-    TeamSettingsDaysOffPatch,
-    TeamSettingsIteration,
-    WorkRestClient,
-    TeamMemberCapacityIdentityRef
-} from "azure-devops-extension-api/work";
-
 import { ObservableValue, ObservableArray } from "azure-devops-ui/Core/Observable";
-
 import { EventInput } from "@fullcalendar/core";
 import { EventSourceError } from "@fullcalendar/core/structs/event-source";
-
 import { generateColor } from "./Color";
 import { ICalendarEvent, IEventIcon, IEventCategory } from "./Contracts";
 import { formatDate, getDatesInRange, shiftToUTC, shiftToLocal } from "./TimeLib";
+import { TeamMemberCapacityIdentityRef, TeamSettingsIteration, TeamSettingsDaysOff, TeamSettingsDaysOffPatch, CapacityPatch, TeamMemberCapacity } from "azure-devops-extension-api/work/Work";
+import { WorkRestClient } from "azure-devops-extension-api/Work/WorkClient";
 
 export const DaysOffId = "daysOff";
 export const Everyone = "Everyone";

webpack.config.js

@@ -17,7 +17,8 @@ module.exports = {
     resolve: {
         extensions: [".ts", ".tsx", ".js"],
         alias: {
-            "azure-devops-extension-sdk": path.resolve("node_modules/azure-devops-extension-sdk")
+            "azure-devops-extension-sdk": path.resolve("node_modules/azure-devops-extension-sdk"),
+            "azure-devops-extension-api": path.resolve("node_modules/azure-devops-extension-api")
         }
     },
     stats: {
@@ -27,7 +28,8 @@ module.exports = {
         rules: [
             {
                 test: /\.tsx?$/,
-                loader: "ts-loader"
+                loader: "ts-loader",
+                exclude: /node_modules/
             },
             {
                 test: /\.scss$/,