@norskvideo/norsk-studio-source-switcher 1.27.0-2025-05-21-b03b48ea → 1.27.0-2025-05-26-a443eb84

package/client/info.js

@@ -24645,32 +24645,32 @@ function clsx() {
 
 // ../../node_modules/tailwind-merge/dist/bundle-mjs.mjs
 var CLASS_PART_SEPARATOR = "-";
-function createClassGroupUtils(config) {
+var createClassGroupUtils = (config) => {
   const classMap = createClassMap(config);
   const {
     conflictingClassGroups,
     conflictingClassGroupModifiers
   } = config;
-  function getClassGroupId(className) {
+  const getClassGroupId = (className) => {
     const classParts = className.split(CLASS_PART_SEPARATOR);
     if (classParts[0] === "" && classParts.length !== 1) {
       classParts.shift();
     }
     return getGroupRecursive(classParts, classMap) || getGroupIdForArbitraryProperty(className);
-  }
-  function getConflictingClassGroupIds(classGroupId, hasPostfixModifier) {
+  };
+  const getConflictingClassGroupIds = (classGroupId, hasPostfixModifier) => {
     const conflicts = conflictingClassGroups[classGroupId] || [];
     if (hasPostfixModifier && conflictingClassGroupModifiers[classGroupId]) {
       return [...conflicts, ...conflictingClassGroupModifiers[classGroupId]];
     }
     return conflicts;
-  }
+  };
   return {
     getClassGroupId,
     getConflictingClassGroupIds
   };
-}
-function getGroupRecursive(classParts, classPartObject) {
+};
+var getGroupRecursive = (classParts, classPartObject) => {
   if (classParts.length === 0) {
     return classPartObject.classGroupId;
   }
@@ -24687,9 +24687,9 @@ function getGroupRecursive(classParts, classPartObject) {
   return classPartObject.validators.find(({
     validator
   }) => validator(classRest))?.classGroupId;
-}
+};
 var arbitraryPropertyRegex = /^\[(.+)\]$/;
-function getGroupIdForArbitraryProperty(className) {
+var getGroupIdForArbitraryProperty = (className) => {
   if (arbitraryPropertyRegex.test(className)) {
     const arbitraryPropertyClassName = arbitraryPropertyRegex.exec(className)[1];
     const property = arbitraryPropertyClassName?.substring(0, arbitraryPropertyClassName.indexOf(":"));
@@ -24697,8 +24697,8 @@ function getGroupIdForArbitraryProperty(className) {
       return "arbitrary.." + property;
     }
   }
-}
-function createClassMap(config) {
+};
+var createClassMap = (config) => {
   const {
     theme,
     prefix
@@ -24712,8 +24712,8 @@ function createClassMap(config) {
     processClassesRecursively(classGroup, classMap, classGroupId, theme);
   });
   return classMap;
-}
-function processClassesRecursively(classGroup, classPartObject, classGroupId, theme) {
+};
+var processClassesRecursively = (classGroup, classPartObject, classGroupId, theme) => {
   classGroup.forEach((classDefinition) => {
     if (typeof classDefinition === "string") {
       const classPartObjectToEdit = classDefinition === "" ? classPartObject : getPart(classPartObject, classDefinition);
@@ -24735,8 +24735,8 @@ function processClassesRecursively(classGroup, classPartObject, classGroupId, th
       processClassesRecursively(classGroup2, getPart(classPartObject, key), classGroupId, theme);
     });
   });
-}
-function getPart(classPartObject, path) {
+};
+var getPart = (classPartObject, path) => {
   let currentClassPartObject = classPartObject;
   path.split(CLASS_PART_SEPARATOR).forEach((pathPart) => {
     if (!currentClassPartObject.nextPart.has(pathPart)) {
@@ -24748,11 +24748,9 @@ function getPart(classPartObject, path) {
     currentClassPartObject = currentClassPartObject.nextPart.get(pathPart);
   });
   return currentClassPartObject;
-}
-function isThemeGetter(func) {
-  return func.isThemeGetter;
-}
-function getPrefixedClassGroupEntries(classGroupEntries, prefix) {
+};
+var isThemeGetter = (func) => func.isThemeGetter;
+var getPrefixedClassGroupEntries = (classGroupEntries, prefix) => {
   if (!prefix) {
     return classGroupEntries;
   }
@@ -24768,8 +24766,8 @@ function getPrefixedClassGroupEntries(classGroupEntries, prefix) {
     });
     return [classGroupId, prefixedClassGroup];
   });
-}
-function createLruCache(maxCacheSize) {
+};
+var createLruCache = (maxCacheSize) => {
   if (maxCacheSize < 1) {
     return {
       get: () => void 0,
@@ -24780,7 +24778,7 @@ function createLruCache(maxCacheSize) {
   let cacheSize = 0;
   let cache = /* @__PURE__ */ new Map();
   let previousCache = /* @__PURE__ */ new Map();
-  function update(key, value) {
+  const update = (key, value) => {
     cache.set(key, value);
     cacheSize++;
     if (cacheSize > maxCacheSize) {
@@ -24788,7 +24786,7 @@ function createLruCache(maxCacheSize) {
       previousCache = cache;
       cache = /* @__PURE__ */ new Map();
     }
-  }
+  };
   return {
     get(key) {
       let value = cache.get(key);
@@ -24808,9 +24806,9 @@ function createLruCache(maxCacheSize) {
       }
     }
   };
-}
+};
 var IMPORTANT_MODIFIER = "!";
-function createParseClassName(config) {
+var createParseClassName = (config) => {
   const {
     separator,
     experimentalParseClassName
@@ -24818,7 +24816,7 @@ function createParseClassName(config) {
   const isSeparatorSingleCharacter = separator.length === 1;
   const firstSeparatorCharacter = separator[0];
   const separatorLength = separator.length;
-  function parseClassName(className) {
+  const parseClassName = (className) => {
     const modifiers = [];
     let bracketDepth = 0;
     let modifierStart = 0;
@@ -24852,18 +24850,16 @@ function createParseClassName(config) {
       baseClassName,
       maybePostfixModifierPosition
     };
-  }
+  };
   if (experimentalParseClassName) {
-    return function parseClassNameExperimental(className) {
-      return experimentalParseClassName({
-        className,
-        parseClassName
-      });
-    };
+    return (className) => experimentalParseClassName({
+      className,
+      parseClassName
+    });
   }
   return parseClassName;
-}
-function sortModifiers(modifiers) {
+};
+var sortModifiers = (modifiers) => {
   if (modifiers.length <= 1) {
     return modifiers;
   }
@@ -24880,23 +24876,24 @@ function sortModifiers(modifiers) {
   });
   sortedModifiers.push(...unsortedModifiers.sort());
   return sortedModifiers;
-}
-function createConfigUtils(config) {
-  return {
-    cache: createLruCache(config.cacheSize),
-    parseClassName: createParseClassName(config),
-    ...createClassGroupUtils(config)
-  };
-}
+};
+var createConfigUtils = (config) => ({
+  cache: createLruCache(config.cacheSize),
+  parseClassName: createParseClassName(config),
+  ...createClassGroupUtils(config)
+});
 var SPLIT_CLASSES_REGEX = /\s+/;
-function mergeClassList(classList, configUtils) {
+var mergeClassList = (classList, configUtils) => {
   const {
     parseClassName,
     getClassGroupId,
     getConflictingClassGroupIds
   } = configUtils;
-  const classGroupsInConflict = /* @__PURE__ */ new Set();
-  return classList.trim().split(SPLIT_CLASSES_REGEX).map((originalClassName) => {
+  const classGroupsInConflict = [];
+  const classNames = classList.trim().split(SPLIT_CLASSES_REGEX);
+  let result = "";
+  for (let index2 = classNames.length - 1; index2 >= 0; index2 -= 1) {
+    const originalClassName = classNames[index2];
     const {
       modifiers,
       hasImportantModifier,
@@ -24907,47 +24904,32 @@ function mergeClassList(classList, configUtils) {
     let classGroupId = getClassGroupId(hasPostfixModifier ? baseClassName.substring(0, maybePostfixModifierPosition) : baseClassName);
     if (!classGroupId) {
       if (!hasPostfixModifier) {
-        return {
-          isTailwindClass: false,
-          originalClassName
-        };
+        result = originalClassName + (result.length > 0 ? " " + result : result);
+        continue;
       }
       classGroupId = getClassGroupId(baseClassName);
       if (!classGroupId) {
-        return {
-          isTailwindClass: false,
-          originalClassName
-        };
+        result = originalClassName + (result.length > 0 ? " " + result : result);
+        continue;
       }
       hasPostfixModifier = false;
     }
     const variantModifier = sortModifiers(modifiers).join(":");
     const modifierId = hasImportantModifier ? variantModifier + IMPORTANT_MODIFIER : variantModifier;
-    return {
-      isTailwindClass: true,
-      modifierId,
-      classGroupId,
-      originalClassName,
-      hasPostfixModifier
-    };
-  }).reverse().filter((parsed) => {
-    if (!parsed.isTailwindClass) {
-      return true;
-    }
-    const {
-      modifierId,
-      classGroupId,
-      hasPostfixModifier
-    } = parsed;
     const classId = modifierId + classGroupId;
-    if (classGroupsInConflict.has(classId)) {
-      return false;
+    if (classGroupsInConflict.includes(classId)) {
+      continue;
     }
-    classGroupsInConflict.add(classId);
-    getConflictingClassGroupIds(classGroupId, hasPostfixModifier).forEach((group) => classGroupsInConflict.add(modifierId + group));
-    return true;
-  }).reverse().map((parsed) => parsed.originalClassName).join(" ");
-}
+    classGroupsInConflict.push(classId);
+    const conflictGroups = getConflictingClassGroupIds(classGroupId, hasPostfixModifier);
+    for (let i = 0; i < conflictGroups.length; ++i) {
+      const group = conflictGroups[i];
+      classGroupsInConflict.push(modifierId + group);
+    }
+    result = originalClassName + (result.length > 0 ? " " + result : result);
+  }
+  return result;
+};
 function twJoin() {
   let index2 = 0;
   let argument;
@@ -24963,7 +24945,7 @@ function twJoin() {
   }
   return string;
 }
-function toValue(mix) {
+var toValue = (mix) => {
   if (typeof mix === "string") {
     return mix;
   }
@@ -24978,7 +24960,7 @@ function toValue(mix) {
     }
   }
   return string;
-}
+};
 function createTailwindMerge(createConfigFirst, ...createConfigRest) {
   let configUtils;
   let cacheGet;
@@ -25005,11 +24987,11 @@ function createTailwindMerge(createConfigFirst, ...createConfigRest) {
     return functionToCall(twJoin.apply(null, arguments));
   };
 }
-function fromTheme(key) {
+var fromTheme = (key) => {
   const themeGetter = (theme) => theme[key] || [];
   themeGetter.isThemeGetter = true;
   return themeGetter;
-}
+};
 var arbitraryValueRegex = /^\[(?:([a-z-]+):)?(.+)\]$/i;
 var fractionRegex = /^\d+\/\d+$/;
 var stringLengths = /* @__PURE__ */ new Set(["px", "full", "screen"]);
@@ -25018,48 +25000,22 @@ var lengthUnitRegex = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|
 var colorFunctionRegex = /^(rgba?|hsla?|hwb|(ok)?(lab|lch))\(.+\)$/;
 var shadowRegex = /^(inset_)?-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/;
 var imageRegex = /^(url|image|image-set|cross-fade|element|(repeating-)?(linear|radial|conic)-gradient)\(.+\)$/;
-function isLength(value) {
-  return isNumber(value) || stringLengths.has(value) || fractionRegex.test(value);
-}
-function isArbitraryLength(value) {
-  return getIsArbitraryValue(value, "length", isLengthOnly);
-}
-function isNumber(value) {
-  return Boolean(value) && !Number.isNaN(Number(value));
-}
-function isArbitraryNumber(value) {
-  return getIsArbitraryValue(value, "number", isNumber);
-}
-function isInteger(value) {
-  return Boolean(value) && Number.isInteger(Number(value));
-}
-function isPercent(value) {
-  return value.endsWith("%") && isNumber(value.slice(0, -1));
-}
-function isArbitraryValue(value) {
-  return arbitraryValueRegex.test(value);
-}
-function isTshirtSize(value) {
-  return tshirtUnitRegex.test(value);
-}
+var isLength = (value) => isNumber(value) || stringLengths.has(value) || fractionRegex.test(value);
+var isArbitraryLength = (value) => getIsArbitraryValue(value, "length", isLengthOnly);
+var isNumber = (value) => Boolean(value) && !Number.isNaN(Number(value));
+var isArbitraryNumber = (value) => getIsArbitraryValue(value, "number", isNumber);
+var isInteger = (value) => Boolean(value) && Number.isInteger(Number(value));
+var isPercent = (value) => value.endsWith("%") && isNumber(value.slice(0, -1));
+var isArbitraryValue = (value) => arbitraryValueRegex.test(value);
+var isTshirtSize = (value) => tshirtUnitRegex.test(value);
 var sizeLabels = /* @__PURE__ */ new Set(["length", "size", "percentage"]);
-function isArbitrarySize(value) {
-  return getIsArbitraryValue(value, sizeLabels, isNever);
-}
-function isArbitraryPosition(value) {
-  return getIsArbitraryValue(value, "position", isNever);
-}
+var isArbitrarySize = (value) => getIsArbitraryValue(value, sizeLabels, isNever);
+var isArbitraryPosition = (value) => getIsArbitraryValue(value, "position", isNever);
 var imageLabels = /* @__PURE__ */ new Set(["image", "url"]);
-function isArbitraryImage(value) {
-  return getIsArbitraryValue(value, imageLabels, isImage);
-}
-function isArbitraryShadow(value) {
-  return getIsArbitraryValue(value, "", isShadow);
-}
-function isAny() {
-  return true;
-}
-function getIsArbitraryValue(value, label, testValue) {
+var isArbitraryImage = (value) => getIsArbitraryValue(value, imageLabels, isImage);
+var isArbitraryShadow = (value) => getIsArbitraryValue(value, "", isShadow);
+var isAny = () => true;
+var getIsArbitraryValue = (value, label, testValue) => {
   const result = arbitraryValueRegex.exec(value);
   if (result) {
     if (result[1]) {
@@ -25068,20 +25024,17 @@ function getIsArbitraryValue(value, label, testValue) {
     return testValue(result[2]);
   }
   return false;
-}
-function isLengthOnly(value) {
-  return lengthUnitRegex.test(value) && !colorFunctionRegex.test(value);
-}
-function isNever() {
-  return false;
-}
-function isShadow(value) {
-  return shadowRegex.test(value);
-}
-function isImage(value) {
-  return imageRegex.test(value);
-}
-function getDefaultConfig() {
+};
+var isLengthOnly = (value) => (
+  // `colorFunctionRegex` check is necessary because color functions can have percentages in them which which would be incorrectly classified as lengths.
+  // For example, `hsl(0 0% 0%)` would be classified as a length without this check.
+  // I could also use lookbehind assertion in `lengthUnitRegex` but that isn't supported widely enough.
+  lengthUnitRegex.test(value) && !colorFunctionRegex.test(value)
+);
+var isNever = () => false;
+var isShadow = (value) => shadowRegex.test(value);
+var isImage = (value) => imageRegex.test(value);
+var getDefaultConfig = () => {
   const colors = fromTheme("colors");
   const spacing = fromTheme("spacing");
   const blur = fromTheme("blur");
@@ -25119,7 +25072,6 @@ function getDefaultConfig() {
   const getAlign = () => ["start", "end", "center", "between", "around", "evenly", "stretch"];
   const getZeroAndEmpty = () => ["", "0", isArbitraryValue];
   const getBreaks = () => ["auto", "avoid", "all", "avoid-page", "page", "left", "right", "column"];
-  const getNumber = () => [isNumber, isArbitraryNumber];
   const getNumberAndArbitrary = () => [isNumber, isArbitraryValue];
   return {
     cacheSize: 500,
@@ -25128,12 +25080,12 @@ function getDefaultConfig() {
       colors: [isAny],
       spacing: [isLength, isArbitraryLength],
       blur: ["none", "", isTshirtSize, isArbitraryValue],
-      brightness: getNumber(),
+      brightness: getNumberAndArbitrary(),
       borderColor: [colors],
       borderRadius: ["none", "", "full", isTshirtSize, isArbitraryValue],
       borderSpacing: getSpacingWithArbitrary(),
       borderWidth: getLengthWithEmptyAndArbitrary(),
-      contrast: getNumber(),
+      contrast: getNumberAndArbitrary(),
       grayscale: getZeroAndEmpty(),
       hueRotate: getNumberAndArbitrary(),
       invert: getZeroAndEmpty(),
@@ -25142,10 +25094,10 @@ function getDefaultConfig() {
       gradientColorStopPositions: [isPercent, isArbitraryLength],
       inset: getSpacingWithAutoAndArbitrary(),
       margin: getSpacingWithAutoAndArbitrary(),
-      opacity: getNumber(),
+      opacity: getNumberAndArbitrary(),
       padding: getSpacingWithArbitrary(),
-      saturate: getNumber(),
-      scale: getNumber(),
+      saturate: getNumberAndArbitrary(),
+      scale: getNumberAndArbitrary(),
       sepia: getZeroAndEmpty(),
       skew: getNumberAndArbitrary(),
       space: getSpacingWithArbitrary(),
@@ -25846,7 +25798,7 @@ function getDefaultConfig() {
        * Font Variant Numeric
        * @see https://tailwindcss.com/docs/font-variant-numeric
        */
-      "fvn-fraction": ["diagonal-fractions", "stacked-fractons"],
+      "fvn-fraction": ["diagonal-fractions", "stacked-fractions"],
       /**
        * Letter Spacing
        * @see https://tailwindcss.com/docs/letter-spacing
@@ -26370,6 +26322,20 @@ function getDefaultConfig() {
       "border-color-y": [{
         "border-y": [borderColor]
       }],
+      /**
+       * Border Color S
+       * @see https://tailwindcss.com/docs/border-color
+       */
+      "border-color-s": [{
+        "border-s": [borderColor]
+      }],
+      /**
+       * Border Color E
+       * @see https://tailwindcss.com/docs/border-color
+       */
+      "border-color-e": [{
+        "border-e": [borderColor]
+      }],
       /**
        * Border Color Top
        * @see https://tailwindcss.com/docs/border-color
@@ -27116,7 +27082,7 @@ function getDefaultConfig() {
       "border-w": ["border-w-s", "border-w-e", "border-w-t", "border-w-r", "border-w-b", "border-w-l"],
       "border-w-x": ["border-w-r", "border-w-l"],
       "border-w-y": ["border-w-t", "border-w-b"],
-      "border-color": ["border-color-t", "border-color-r", "border-color-b", "border-color-l"],
+      "border-color": ["border-color-s", "border-color-e", "border-color-t", "border-color-r", "border-color-b", "border-color-l"],
       "border-color-x": ["border-color-r", "border-color-l"],
       "border-color-y": ["border-color-t", "border-color-b"],
       "scroll-m": ["scroll-mx", "scroll-my", "scroll-ms", "scroll-me", "scroll-mt", "scroll-mr", "scroll-mb", "scroll-ml"],
@@ -27134,7 +27100,7 @@ function getDefaultConfig() {
       "font-size": ["leading"]
     }
   };
-}
+};
 var twMerge = /* @__PURE__ */ createTailwindMerge(getDefaultConfig);
 
 // build/utils.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/norsk-studio-source-switcher",
-  "version": "1.27.0-2025-05-21-b03b48ea",
+  "version": "1.27.0-2025-05-26-a443eb84",
   "description": "",
   "scripts": {
     "clean": "rm -rf lib client build",
@@ -25,8 +25,8 @@
     "@aws-sdk/client-medialive": "^3.499.0",
     "@aws-sdk/client-mediapackage": "^3.499.0",
     "@aws-sdk/client-translate": "^3.535.0",
-    "@norskvideo/norsk-sdk": "^1.0.402-2025-05-21-59ecadb4",
-    "@norskvideo/norsk-studio": "1.27.0-2025-05-21-b03b48ea",
+    "@norskvideo/norsk-sdk": "^1.0.402-2025-05-26-c7282067",
+    "@norskvideo/norsk-studio": "1.27.0-2025-05-26-a443eb84",
     "@norskvideo/webrtc-client": "^0.1.2",
     "chart.js": "^4.4.2",
     "express": "^4.18.2",
@@ -60,6 +60,7 @@
     "npm-run-all": "^4.1.5",
     "openapi-typescript": "^7.3.0",
     "puppeteer": "^21.5.2",
+    "tailwind-merge": "^2.6.0",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.4.5"
   }