Skip to content

Commit

Permalink
Merge branch 'master' into consume-field-hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
gautamsi authored Jan 13, 2020
2 parents b3c496f + 220d3a4 commit 0248ee7
Show file tree
Hide file tree
Showing 245 changed files with 3,907 additions and 2,552 deletions.
43 changes: 0 additions & 43 deletions .changeset/bright-elephants-tan.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/bright-garlics-sleep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@keystonejs/field-content': minor
'@keystonejs/fields': minor
---

The presentation and usability of the content blocks editor was improved.
5 changes: 5 additions & 0 deletions .changeset/chatty-walls-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystonejs/app-admin-ui': patch
---

Small UX updates to item/list search input
5 changes: 5 additions & 0 deletions .changeset/dull-taxis-relax.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystonejs/keystone': patch
---

Apps which don't define `build()` no longer cause keystone to fail.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
'@keystonejs/demo-project-meetup': patch
---

Updated eslint dependencies.
Fixed typo in filename
5 changes: 5 additions & 0 deletions .changeset/green-bees-learn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystonejs/mongo-join-builder': patch
---

Refactored the package internals for better DX.
5 changes: 5 additions & 0 deletions .changeset/odd-ladybugs-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystonejs/mongo-join-builder': patch
---

Refactor the internal `relationshipTokenizer`, no functional changes.
5 changes: 5 additions & 0 deletions .changeset/twelve-mugs-design.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@keystonejs/mongo-join-builder': patch
---

Refactored internals of the join query builder, no functional changes.
4 changes: 4 additions & 0 deletions .circleci/run-or-bail.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ if (process.env.CIRCLE_JOB !== 'simple_tests') {
});
}

// Remove empty
changedFiles = changedFiles.filter(filename => filename && filename !== '');

if (changedFiles.length === 0) {
shouldRunCI = false;
}
Expand All @@ -39,4 +42,5 @@ if (shouldRunCI === false) {
spawnSync('circleci-agent', ['step', 'halt'], { stdio: 'inherit' });
} else {
console.log('Test not skipped');
console.log(changedFiles);
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ If you develop custom fields, adapters, apps or any other Keystone feature, (or

## Code of Conduct

KeystoneJS adheres to the [Contributor Covenant Code of Conduct](code-of-conduct.md).
KeystoneJS adheres to the [Contributor Covenant Code of Conduct](/code-of-conduct.md).

## Repository Setup

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ This project follows the [all-contributors](https://github.com/all-contributors/

**Contributions of any kind are welcome!**

You will find the set-up steps in this readme and full release processes and project guidelines in [`CONTRIBUTING.md`](./CONTRIBUTING.md).
You will find the set-up steps in this readme and full release processes and project guidelines in [`CONTRIBUTING.md`](/CONTRIBUTING.md).

### Contributors

Expand Down Expand Up @@ -135,7 +135,7 @@ We'd like to start by thanking all our wonderful contributors:
These projects are designed to show off different aspects of KeystoneJS features
at a range of complexities (from a simple Todo App to a complex Meetup Site).

See the [`demo-projects/README.md`](./demo-projects/README.md) docs to get
See the [`demo-projects/README.md`](/demo-projects/README.md) docs to get
started.

### Development Practices
Expand Down Expand Up @@ -166,15 +166,15 @@ yarn
yarn dev
```

See [`demo-projects/README.md`](./demo-projects/README.md) for more details on
See [`demo-projects/README.md`](/demo-projects/README.md) for more details on
the available demo projects.

#### Note For Windows Users

While running `yarn` on Windows, the process may fail with an error such as this:

```sh
error { [Error: EPERM: operation not permitted, symlink 'C:\Users\user\Documents\keystone-5\packages\arch\packages\alert\src\index.js' -> 'C:\Users\user\Documents\keystone-5\packages\arch\packages\alert\dist\alert.cjs.js.flow']
Error: EPERM: operation not permitted, symlink 'C:\Users\user\Documents\keystone-5\packages\arch\packages\alert\src\index.js' -> 'C:\Users\user\Documents\keystone-5\packages\arch\packages\alert\dist\alert.cjs.js.flow'
```

This is due to permission restrictions regarding the creation of [symbolic links](https://blogs.windows.com/windowsdeveloper/2016/12/02/symlinks-windows-10/). To solve this, you should enable Windows' [Developer Mode](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development?redirectedfrom=MSDN) and run `yarn` again.
Expand Down Expand Up @@ -274,7 +274,7 @@ Where `simple_tests` can be replaced with any job listed in

## Code of Conduct

KeystoneJS adheres to the [Contributor Covenant Code of Conduct](code-of-conduct.md).
KeystoneJS adheres to the [Contributor Covenant Code of Conduct](/code-of-conduct.md).

## License

Expand Down
12 changes: 12 additions & 0 deletions api-tests/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @keystonejs/api-tests

## 5.0.2

### Patch Changes

- [`f3ea15f8`](https://github.com/keystonejs/keystone/commit/f3ea15f86f7bbd08abddcf3a63c5c66e86693d29) [#2189](https://github.com/keystonejs/keystone/pull/2189) - Upgraded prettier to 1.19.1 and formatted code accordingly.
- Updated dependencies [[`38f88b62`](https://github.com/keystonejs/keystone/commit/38f88b62d9592d91b56528d4d9c40e9399440c4a), [`f3ea15f8`](https://github.com/keystonejs/keystone/commit/f3ea15f86f7bbd08abddcf3a63c5c66e86693d29), [`3d7222cd`](https://github.com/keystonejs/keystone/commit/3d7222cd589ce8accbf3a9de141976c38e2c7e23), [`4cd4499d`](https://github.com/keystonejs/keystone/commit/4cd4499d9d19a5b379b2ae6ab1028c008248629a), [`ef419b59`](https://github.com/keystonejs/keystone/commit/ef419b59729a050f25fc886be6ec8ce17cbb1104), [`05d07adf`](https://github.com/keystonejs/keystone/commit/05d07adf84059ff565cd2394f68d71d92e657485), [`78193f9c`](https://github.com/keystonejs/keystone/commit/78193f9c9d93655fb0d4b8dc494fbe4c622a4d64)]:
- @keystonejs/fields@6.0.5
- @keystonejs/adapter-knex@6.1.3
- @keystonejs/keystone@5.4.1
- @keystonejs/test-utils@5.0.3
- @keystonejs/adapter-mongoose@5.1.4

## 5.0.1

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions api-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@keystonejs/api-tests",
"description": "A set of tests for running against the KeystoneJS API.",
"private": true,
"version": "5.0.1",
"version": "5.0.2",
"author": "The KeystoneJS Development Team",
"license": "MIT",
"engines": {
Expand All @@ -11,13 +11,13 @@
"repository": "https://github.com/keystonejs/keystone.git",
"homepage": "https://github.com/keystonejs/keystone",
"devDependencies": {
"@keystonejs/adapter-knex": "^6.0.0",
"@keystonejs/adapter-mongoose": "^5.1.3",
"@keystonejs/adapter-knex": "^6.1.3",
"@keystonejs/adapter-mongoose": "^5.1.4",
"@keystonejs/app-graphql": "^5.0.1",
"@keystonejs/fields": "^6.0.0",
"@keystonejs/keystone": "^5.3.0",
"@keystonejs/fields": "^6.0.5",
"@keystonejs/keystone": "^5.4.1",
"@keystonejs/session": "^5.0.0",
"@keystonejs/test-utils": "^5.0.2",
"@keystonejs/test-utils": "^5.0.3",
"body-parser": "^1.18.2",
"cookie-signature": "^1.1.0",
"cuid": "^2.1.6",
Expand Down
Loading

0 comments on commit 0248ee7

Please sign in to comment.