Skip to content

Commit

Permalink
Merge branch 'master' into nextra
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
#	.prettierignore
#	package-lock.json
#	package.json
#	packages/docs/pages/api-reference/api-bridges.md
#	packages/docs/pages/api-reference/api-context-data.md
#	packages/docs/pages/api-reference/api-fields.md
#	packages/docs/pages/api-reference/api-helpers.md
#	packages/docs/pages/examples/examples-custom-bridge.md
#	packages/docs/pages/examples/examples-custom-fields.md
#	packages/docs/pages/examples/examples-custom-form.md
#	packages/docs/pages/getting-started/faq.md
#	packages/docs/pages/getting-started/migrating-2-to-3.md
#	packages/docs/pages/getting-started/migrating-3-to-4.md
#	packages/docs/pages/introduction/motivation.md
#	packages/docs/pages/introduction/what-are-uniforms.md
#	packages/docs/pages/tutorials/tutorials-basic-uniforms-usage.md
#	packages/docs/pages/tutorials/tutorials-creating-custom-theme.md
#	packages/docs/pages/under-the-hood/uth-autofield-algorithm.md
#	packages/docs/pages/under-the-hood/uth-bridge-concept.mdx
#	packages/docs/public/favicon.ico
#	packages/docs/public/img/hoc-hell.png
#	packages/docs/public/img/uniforms-graph.svg
#	packages/docs/public/img/uniforms-traits.png
#	packages/docs/public/img/uniforms.svg
#	packages/docs/public/robots.txt
#	reproductions/simple-schema.d.ts
  • Loading branch information
zaxovaiko committed Sep 20, 2024
2 parents 132da51 + e020a5e commit f29c6ce
Show file tree
Hide file tree
Showing 66 changed files with 16,733 additions and 24,150 deletions.
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/.idea
/.parcel-cache
/coverage
/lerna-debug.log

/node_modules
/npm-debug.log
Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Our kanban board is public and available [here](https://github.com/orgs/vazco/pr

- Create a fork from where you want to base your work.
- Clone the repo and run `npm ci` **in the top-level only**.
- Make sure you are using `npm` that understands the `package-lock.json` format. At the moment, it's at least v7.
- Make sure you are using `npm` that understands the `package-lock.json` format. Check the current version in the `package.json` file.
- Make sure your commit messages are in the proper format:
- Bugfix or feature:
- `Implemented asynchronous validation (closes #17).`
Expand All @@ -32,14 +32,14 @@ Our kanban board is public and available [here](https://github.com/orgs/vazco/pr

### Development

For the best local developer experience (DX) it is recommended to start `build` and `test` in `--watch` mode.
For the best local developer experience (DX) it is recommended to run scripts in watch mode.

Run the commands below in the root directory.

#### Running the build in watch mode

```sh
npm run build -- --watch
npm run build:watch
```

#### Running the tests in watch mode
Expand Down
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
- .prettierrc.js
- .stylelintrc
- jest.config.js
- lerna.json
- turbo.json
- package-lock.json
- package.json
- scripts/**/*
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
/.idea
/.parcel-cache
/coverage
/lerna-debug.log
.DS_Store
.turbo

/node_modules
/npm-debug.log
/npm-debug.log*
/packages/*/cjs
/packages/*/esm
/packages/*/node_modules
/reproductions/dist
/reproductions/node_modules
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
22.8.0
4 changes: 0 additions & 4 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/.idea
/.parcel-cache
/coverage
/lerna-debug.log
/lerna.json
/node_modules
/npm-debug.log
/npm-debug.log*
/packages/*/cjs
/packages/*/esm
/packages/*/node_modules
/reproductions/dist
/reproductions/node_modules
9 changes: 9 additions & 0 deletions lerna-debug.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
136 error Error: Command failed with exit code 1: git push --follow-tags --no-verify origin master
136 error remote: error: GH006: Protected branch update failed for refs/heads/master.
136 error remote: error: Changes must be made through a pull request. 3 of 3 required status checks are expected.
136 error To github.com:vazco/uniforms.git
136 error * [new tag] v4.0.0-alpha.6 -> v4.0.0-alpha.6
136 error ! [remote rejected] master -> master (protected branch hook declined)
136 error error: failed to push some refs to 'github.com:vazco/uniforms.git'
136 error at makeError (/Users/zaxovaiko/Documents/vazco/uniforms/node_modules/execa/lib/error.js:60:11)
136 error at handlePromise (/Users/zaxovaiko/Documents/vazco/uniforms/node_modules/execa/index.js:118:26)
4 changes: 0 additions & 4 deletions lerna.json

This file was deleted.

Loading

0 comments on commit f29c6ce

Please sign in to comment.