fix: merge conflict

washingtonpost · Jul 19, 2023 · d6018b0 · d6018b0
2 parents ade21f2 + 5178efb
commit d6018b0
Show file tree

Hide file tree

Showing 115 changed files with 2,093 additions and 1,262 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,68 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.8.5](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.4...v1.8.5) (2023-07-06)
+## [1.9.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.9.0...v1.9.1) (2023-07-17)
 
-**Note:** Version bump only for package root
 
+### Bug Fixes
 
+* Label + Checkbox Bug ([#445](https://github.com/washingtonpost/wpds-ui-kit/issues/445)) ([9749319](https://github.com/washingtonpost/wpds-ui-kit/commit/974931905c57d6a19d3e9138d7d57bf98392935c))
 
 
 
-## [1.8.4](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.3...v1.8.4) (2023-07-06)
-
-**Note:** Version bump only for package root
 
 
+# [1.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.5...v1.9.0) (2023-07-14)
 
 
+### Features
 
-## [1.8.3](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.2...v1.8.3) (2023-07-06)
+* add Postoni Ultra ([#438](https://github.com/washingtonpost/wpds-ui-kit/issues/438)) ([1124240](https://github.com/washingtonpost/wpds-ui-kit/commit/11242406de14833f7d5d37fec9cfabd3c5a2ba05))
+* add remaining examples to InputSearch docs and additional testing examples and validation ([e527dd9](https://github.com/washingtonpost/wpds-ui-kit/commit/e527dd91940eb47df0c61a5aae31a01270652075))
 
 
-### Bug Fixes
 
-* type InputText buttons as buttons to prevent form submission ([6d07599](https://github.com/washingtonpost/wpds-ui-kit/commit/6d07599fcbf03676469cced8921e31226071db50))
 
 
+## [1.8.5](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.4...v1.8.5) (2023-07-06)
 
+**Note:** Version bump only for package root
 
+## [1.8.4](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.3...v1.8.4) (2023-07-06)
 
-## [1.8.2](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.1...v1.8.2) (2023-06-30)
+**Note:** Version bump only for package root
 
+## [1.8.3](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.2...v1.8.3) (2023-07-06)
 
 ### Bug Fixes
 
-* updated InputSearch sub component types ([18e9bc1](https://github.com/washingtonpost/wpds-ui-kit/commit/18e9bc17f93cb050e69b1c15ada1a42eab1e4b30))
-
+- type InputText buttons as buttons to prevent form submission ([6d07599](https://github.com/washingtonpost/wpds-ui-kit/commit/6d07599fcbf03676469cced8921e31226071db50))
 
+## [1.8.2](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.1...v1.8.2) (2023-06-30)
 
+### Bug Fixes
 
+- updated InputSearch sub component types ([18e9bc1](https://github.com/washingtonpost/wpds-ui-kit/commit/18e9bc17f93cb050e69b1c15ada1a42eab1e4b30))
 
 ## [1.8.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.0...v1.8.1) (2023-06-28)
 
 **Note:** Version bump only for package root
 
-
-
-
-
 # [1.8.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.7.1...v1.8.0) (2023-06-28)
 
-
 ### Bug Fixes
 
-* not and min breakpoints needed to be one pixel bigger to correctly exclude respective breakpoints ([#429](https://github.com/washingtonpost/wpds-ui-kit/issues/429)) ([ef46482](https://github.com/washingtonpost/wpds-ui-kit/commit/ef4648201c836ba6d78d59165fc4754529407788))
-
+- not and min breakpoints needed to be one pixel bigger to correctly exclude respective breakpoints ([#429](https://github.com/washingtonpost/wpds-ui-kit/issues/429)) ([ef46482](https://github.com/washingtonpost/wpds-ui-kit/commit/ef4648201c836ba6d78d59165fc4754529407788))
 
 ### Features
 
-* make tailwind theme package public ([2b291a2](https://github.com/washingtonpost/wpds-ui-kit/commit/2b291a2539b6ddd3a43f8cc5888ab7acefb1302f))
-* new InputSearch component ([#428](https://github.com/washingtonpost/wpds-ui-kit/issues/428)) ([a84c713](https://github.com/washingtonpost/wpds-ui-kit/commit/a84c71392d87ac6d21bc1d1945be814e178ca890))
-
-
-
-
+- make tailwind theme package public ([2b291a2](https://github.com/washingtonpost/wpds-ui-kit/commit/2b291a2539b6ddd3a43f8cc5888ab7acefb1302f))
+- new InputSearch component ([#428](https://github.com/washingtonpost/wpds-ui-kit/issues/428)) ([a84c713](https://github.com/washingtonpost/wpds-ui-kit/commit/a84c71392d87ac6d21bc1d1945be814e178ca890))
 
 ## [1.7.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.7.0...v1.7.1) (2023-06-20)
 

diff --git a/apps/vite-project/CHANGELOG.md b/apps/vite-project/CHANGELOG.md
@@ -3,56 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.8.5](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.4...v1.8.5) (2023-07-06)
+## [1.9.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.9.0...v1.9.1) (2023-07-17)
 
 **Note:** Version bump only for package vite-project
 
 
 
 
 
-## [1.8.4](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.3...v1.8.4) (2023-07-06)
+# [1.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.5...v1.9.0) (2023-07-14)
 
 **Note:** Version bump only for package vite-project
 
 
 
 
 
-## [1.8.3](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.2...v1.8.3) (2023-07-06)
+## [1.8.5](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.4...v1.8.5) (2023-07-06)
 
 **Note:** Version bump only for package vite-project
 
+## [1.8.4](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.3...v1.8.4) (2023-07-06)
 
+**Note:** Version bump only for package vite-project
 
+## [1.8.3](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.2...v1.8.3) (2023-07-06)
 
+**Note:** Version bump only for package vite-project
 
 ## [1.8.2](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.1...v1.8.2) (2023-06-30)
 
 **Note:** Version bump only for package vite-project
 
-
-
-
-
 ## [1.8.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.0...v1.8.1) (2023-06-28)
 
 **Note:** Version bump only for package vite-project
 
-
-
-
-
 # [1.8.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.7.1...v1.8.0) (2023-06-28)
 
-
 ### Features
 
-* new InputSearch component ([#428](https://github.com/washingtonpost/wpds-ui-kit/issues/428)) ([a84c713](https://github.com/washingtonpost/wpds-ui-kit/commit/a84c71392d87ac6d21bc1d1945be814e178ca890))
-
-
-
-
+- new InputSearch component ([#428](https://github.com/washingtonpost/wpds-ui-kit/issues/428)) ([a84c713](https://github.com/washingtonpost/wpds-ui-kit/commit/a84c71392d87ac6d21bc1d1945be814e178ca890))
 
 ## [1.7.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.7.0...v1.7.1) (2023-06-20)
 

diff --git a/apps/vite-project/package.json b/apps/vite-project/package.json
@@ -1,16 +1,16 @@
 {
   "name": "vite-project",
   "private": true,
-  "version": "1.8.5",
+  "version": "1.9.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@washingtonpost/wpds-kitchen-sink": "1.8.5",
-    "@washingtonpost/wpds-ui-kit": "1.8.5",
+    "@washingtonpost/wpds-kitchen-sink": "1.9.1",
+    "@washingtonpost/wpds-ui-kit": "1.9.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

diff --git a/apps/vite-v2-project/CHANGELOG.md b/apps/vite-v2-project/CHANGELOG.md
@@ -3,56 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.8.5](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.4...v1.8.5) (2023-07-06)
+## [1.9.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.9.0...v1.9.1) (2023-07-17)
 
 **Note:** Version bump only for package vite-v2-project
 
 
 
 
 
-## [1.8.4](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.3...v1.8.4) (2023-07-06)
+# [1.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.5...v1.9.0) (2023-07-14)
 
 **Note:** Version bump only for package vite-v2-project
 
 
 
 
 
-## [1.8.3](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.2...v1.8.3) (2023-07-06)
+## [1.8.5](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.4...v1.8.5) (2023-07-06)
 
 **Note:** Version bump only for package vite-v2-project
 
+## [1.8.4](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.3...v1.8.4) (2023-07-06)
 
+**Note:** Version bump only for package vite-v2-project
 
+## [1.8.3](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.2...v1.8.3) (2023-07-06)
 
+**Note:** Version bump only for package vite-v2-project
 
 ## [1.8.2](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.1...v1.8.2) (2023-06-30)
 
 **Note:** Version bump only for package vite-v2-project
 
-
-
-
-
 ## [1.8.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.8.0...v1.8.1) (2023-06-28)
 
 **Note:** Version bump only for package vite-v2-project
 
-
-
-
-
 # [1.8.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.7.1...v1.8.0) (2023-06-28)
 
-
 ### Features
 
-* new InputSearch component ([#428](https://github.com/washingtonpost/wpds-ui-kit/issues/428)) ([a84c713](https://github.com/washingtonpost/wpds-ui-kit/commit/a84c71392d87ac6d21bc1d1945be814e178ca890))
-
-
-
-
+- new InputSearch component ([#428](https://github.com/washingtonpost/wpds-ui-kit/issues/428)) ([a84c713](https://github.com/washingtonpost/wpds-ui-kit/commit/a84c71392d87ac6d21bc1d1945be814e178ca890))
 
 ## [1.7.1](https://github.com/washingtonpost/wpds-ui-kit/compare/v1.7.0...v1.7.1) (2023-06-20)
 

diff --git a/apps/vite-v2-project/package.json b/apps/vite-v2-project/package.json
@@ -1,15 +1,15 @@
 {
   "name": "vite-v2-project",
   "private": true,
-  "version": "1.8.5",
+  "version": "1.9.1",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@washingtonpost/wpds-kitchen-sink": "1.8.5",
-    "@washingtonpost/wpds-ui-kit": "1.8.5",
+    "@washingtonpost/wpds-kitchen-sink": "1.9.1",
+    "@washingtonpost/wpds-ui-kit": "1.9.1",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },

diff --git a/build.washingtonpost.com/CHANGELOG.md b/build.washingtonpost.com/CHANGELOG.md
@@ -3,56 +3,51 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.8.5](https://github.com/washingtonpost/wpds-docs/compare/v1.8.4...v1.8.5) (2023-07-06)
+## [1.9.1](https://github.com/washingtonpost/wpds-docs/compare/v1.9.0...v1.9.1) (2023-07-17)
 
 **Note:** Version bump only for package @washingtonpost/wpds-docs
 
 
 
 
 
-## [1.8.4](https://github.com/washingtonpost/wpds-docs/compare/v1.8.3...v1.8.4) (2023-07-06)
-
-**Note:** Version bump only for package @washingtonpost/wpds-docs
+# [1.9.0](https://github.com/washingtonpost/wpds-docs/compare/v1.8.5...v1.9.0) (2023-07-14)
 
 
+### Features
 
+* add Postoni Ultra ([#438](https://github.com/washingtonpost/wpds-docs/issues/438)) ([1124240](https://github.com/washingtonpost/wpds-docs/commit/11242406de14833f7d5d37fec9cfabd3c5a2ba05))
+* add remaining examples to InputSearch docs and additional testing examples and validation ([e527dd9](https://github.com/washingtonpost/wpds-docs/commit/e527dd91940eb47df0c61a5aae31a01270652075))
 
 
-## [1.8.3](https://github.com/washingtonpost/wpds-docs/compare/v1.8.2...v1.8.3) (2023-07-06)
-
-**Note:** Version bump only for package @washingtonpost/wpds-docs
 
 
 
+## [1.8.5](https://github.com/washingtonpost/wpds-docs/compare/v1.8.4...v1.8.5) (2023-07-06)
 
+**Note:** Version bump only for package @washingtonpost/wpds-docs
 
-## [1.8.2](https://github.com/washingtonpost/wpds-docs/compare/v1.8.1...v1.8.2) (2023-06-30)
+## [1.8.4](https://github.com/washingtonpost/wpds-docs/compare/v1.8.3...v1.8.4) (2023-07-06)
 
 **Note:** Version bump only for package @washingtonpost/wpds-docs
 
+## [1.8.3](https://github.com/washingtonpost/wpds-docs/compare/v1.8.2...v1.8.3) (2023-07-06)
 
+**Note:** Version bump only for package @washingtonpost/wpds-docs
 
+## [1.8.2](https://github.com/washingtonpost/wpds-docs/compare/v1.8.1...v1.8.2) (2023-06-30)
 
+**Note:** Version bump only for package @washingtonpost/wpds-docs
 
 ## [1.8.1](https://github.com/washingtonpost/wpds-docs/compare/v1.8.0...v1.8.1) (2023-06-28)
 
 **Note:** Version bump only for package @washingtonpost/wpds-docs
 
-
-
-
-
 # [1.8.0](https://github.com/washingtonpost/wpds-docs/compare/v1.7.1...v1.8.0) (2023-06-28)
 
-
 ### Features
 
-* new InputSearch component ([#428](https://github.com/washingtonpost/wpds-docs/issues/428)) ([a84c713](https://github.com/washingtonpost/wpds-docs/commit/a84c71392d87ac6d21bc1d1945be814e178ca890))
-
-
-
-
+- new InputSearch component ([#428](https://github.com/washingtonpost/wpds-docs/issues/428)) ([a84c713](https://github.com/washingtonpost/wpds-docs/commit/a84c71392d87ac6d21bc1d1945be814e178ca890))
 
 ## [1.7.1](https://github.com/washingtonpost/wpds-docs/compare/v1.7.0...v1.7.1) (2023-06-20)