Skip to content
This repository was archived by the owner on Mar 16, 2023. It is now read-only.

Commit d530264

Browse files
committed
chore: merge conflicts
2 parents 6071ef2 + 6a44cd8 commit d530264

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
# Reform
22

3-
⚠️ This project is under development.
3+
[![Documentation](https://img.shields.io/badge/documentation-yes-brightgreen.svg)](https://reform-monoid-dev.vercel.app/)
4+
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](#)
5+
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FMonoidDev%2Freform.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FMonoidDev%2Freform?ref=badge_shield)
6+
7+
⚠️ This project is under development.
8+
## License
9+
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FMonoidDev%2Freform.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FMonoidDev%2Freform?ref=badge_large)
10+
>>>>>>> 6a44cd8f0775ddd6683cd002accf814c95aec8d2

renovate.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"extends": [
3+
"config:base"
4+
],
5+
"rangeStrategy": "update-lockfile",
6+
"packageRules": [
7+
{
8+
"matchUpdateTypes": ["minor", "patch", "pin", "digest"],
9+
"automerge": true
10+
}
11+
],
12+
"reviewers": ["hanayashiki"]
13+
}

src/controls/ArrayFormControl.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ export class ArrayFormControl<F extends AnyFormControl> {
110110
touchAll() {
111111
this.touched.next(true);
112112
for (const control of this.getControls()) {
113-
console.log('Array touched');
114113
control.touchAll();
115114
}
116115
}

src/controls/FormControl.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ export class FormControl<I, O, E extends ErrorMessage = ErrorMessage, Name exten
2727
public options: FormControlOptions = {},
2828
) {
2929
this.input = new BehaviorSubject(initialInput);
30-
this.result = new BehaviorSubject<FormResult<O> | undefined>(this.resolveResult());
31-
console.log(this.input.getValue(), this.result.getValue());
30+
this.result = new BehaviorSubject<FormResult<O> | undefined>(this.resolveResult());
3231
this.touched = new BehaviorSubject(initialMeta?.initialTouched ?? false);
3332

3433
this.unsubcribe = this.startValidation();

0 commit comments

Comments
 (0)