Merge branch 'master' into boilerplate-environment-bump

Author: 00salmon

packages/component-environment/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.6] - 2024-05-07
+
+### Fixed
+
+- Fixed an issue where the locale format `xx_XX` was valid but not `xx`
+
 ## [1.0.5] - 2024-02-14
 
 ### Fixed
@@ -42,7 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Initial version.
 
-[unreleased]: https://github.com/saasquatch/program-tools/compare/%40saasquatch%2Fcomponent-environment%401.0.5...HEAD
+[unreleased]: https://github.com/saasquatch/program-tools/compare/%40saasquatch%2Fcomponent-environment%401.0.6...HEAD
+[1.0.6]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fcomponent-environment%401.0.6
 [1.0.5]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fcomponent-environment%401.0.5
 [1.0.4]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fcomponent-environment%401.0.4
 [1.0.3]: https://github.com/saasquatch/program-tools/releases/tag/%40saasquatch%2Fcomponent-environment%401.0.3

packages/component-environment/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasquatch/component-environment",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Environment and contexts for SaaSquatch components",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

packages/component-environment/package.json

@@ -5,7 +5,7 @@ import { debug as _debug } from "../debug";
 const debug = (...args: any[]) => _debug(LOCALE_CONTEXT_NAME, ...args);
 
 export function validateLocale(locale?: string) {
-  if (locale && /^[a-z]{2}_(?:[A-Z]{2}|[0-9]{3})$/.test(locale)) {
+  if (locale && /^[a-z]{2}(_(?:[A-Z]{2}|[0-9]{3}))?$/.test(locale)) {
     return locale;
   }
 }
@@ -26,6 +26,8 @@ export function lazilyStartLocaleContext() {
       window.widgetIdent?.locale ??
       validateLocale(navigator.language.replaceAll("-", "_"));
 
+    debug("initializing with locale:", locale);
+
     globalProvider = new ContextProvider<string | undefined>({
       element: document.documentElement,
       initialState: locale,