Skip to content

Commit

Permalink
Move all packages into the @keystone-alpha namespace and reset versio…
Browse files Browse the repository at this point in the history
…ns to 0.0.0
  • Loading branch information
timleslie committed Mar 7, 2019
1 parent fae8a97 commit 8b6734a
Show file tree
Hide file tree
Showing 153 changed files with 535 additions and 436 deletions.
28 changes: 28 additions & 0 deletions .changeset/81d374b4/changes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"releases": [
{ "name": "keystone_demo_blog", "type": "major" },
{ "name": "@keystone-alpha/demo-project-todo", "type": "major" },
{ "name": "@keystone-alpha/access-control", "type": "major" },
{ "name": "@keystone-alpha/adapter-knex", "type": "major" },
{ "name": "@keystone-alpha/adapter-mongoose", "type": "major" },
{ "name": "@keystone-alpha/admin-ui", "type": "major" },
{ "name": "@keystone-alpha/apollo-helpers", "type": "major" },
{ "name": "@keystone-alpha/core", "type": "major" },
{ "name": "@keystone-alpha/email", "type": "major" },
{ "name": "@keystone-alpha/field-views-loader", "type": "major" },
{ "name": "@keystone-alpha/fields", "type": "major" },
{ "name": "@keystone-alpha/file-adapters", "type": "major" },
{ "name": "@keystone-alpha/keystone", "type": "major" },
{ "name": "@keystone-alpha/logger", "type": "major" },
{ "name": "@keystone-alpha/mongo-join-builder", "type": "major" },
{ "name": "@keystone-alpha/server", "type": "major" },
{ "name": "@keystone-alpha/test-utils", "type": "major" },
{ "name": "@keystone-alpha/utils", "type": "major" },
{ "name": "@keystone-alpha/cypress-project-access-control", "type": "major" },
{ "name": "@keystone-alpha/cypress-project-basic", "type": "major" },
{ "name": "@keystone-alpha/cypress-project-login", "type": "major" },
{ "name": "@keystone-alpha/cypress-project-twitter-login", "type": "major" },
{ "name": "@keystone-alpha/website", "type": "major" }
],
"dependents": []
}
3 changes: 3 additions & 0 deletions .changeset/81d374b4/changes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- This is the first release of keystone-alpha (previously voussoir).
All packages in the `@voussoir` namespace are now available in the `@keystone-alpha` namespace, starting at version `1.0.0`.
To upgrade your project you must update any `@voussoir/<foo>` dependencies in `package.json` to point to `@keystone-alpha/<foo>: "^1.0.0"` and update any `require`/`import` statements in your code.
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[lints]

[options]
module.name_mapper='^@voussoir\/\(.+\)$' -> '<PROJECT_ROOT>/packages/\1'
module.name_mapper='^@keystone-alpha\/\(.+\)$' -> '<PROJECT_ROOT>/packages/\1'
module.name_mapper='.*FIELD_TYPES' -> '<PROJECT_ROOT>/packages/field-views-loader/field-types'
module.name_mapper='^@arch-ui\/\([^\/]+\)$' -> '@arch-ui/\1/src/index.js'
server.max_workers=1
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ Summary: Fixed a bug that caused relationships to be added twice
Release notes: <none>
Releases: @voussoir/core@minor, @voussoir/adapter-mongoose@patch
Releases: @keystone-alpha/core@minor, @keystone-alpha/adapter-mongoose@patch
Dependents: @voussoir/cypress-project-access-control@patch, @voussoir/cypress-project-basic@patch, @voussoir/cypress-project-login@patch, @voussoir/cypress-project-twitter-login@patch
Dependents: @keystone-alpha/cypress-project-access-control@patch, @keystone-alpha/cypress-project-basic@patch, @keystone-alpha/cypress-project-login@patch, @keystone-alpha/cypress-project-twitter-login@patch
---
{"summary":"Fixed a bug that caused relationships to be added twice","releases":[{"name":"@voussoir/core","type":"minor"},{"name":"@voussoir/adapter-mongoose","type":"patch"}],"dependents":[{"name":"@voussoir/cypress-project-access-control","type":"patch","dependencies":["@voussoir/core","@voussoir/adapter-mongoose"]},{"name":"@voussoir/cypress-project-basic","type":"patch","dependencies":["@voussoir/core","@voussoir/adapter-mongoose"]},{"name":"@voussoir/cypress-project-login","type":"patch","dependencies":["@voussoir/core","@voussoir/adapter-mongoose"]},{"name":"@voussoir/cypress-project-twitter-login","type":"patch","dependencies":["@voussoir/core","@voussoir/adapter-mongoose"]}]}
{"summary":"Fixed a bug that caused relationships to be added twice","releases":[{"name":"@keystone-alpha/core","type":"minor"},{"name":"@keystone-alpha/adapter-mongoose","type":"patch"}],"dependents":[{"name":"@keystone-alpha/cypress-project-access-control","type":"patch","dependencies":["@keystone-alpha/core","@keystone-alpha/adapter-mongoose"]},{"name":"@keystone-alpha/cypress-project-basic","type":"patch","dependencies":["@keystone-alpha/core","@keystone-alpha/adapter-mongoose"]},{"name":"@keystone-alpha/cypress-project-login","type":"patch","dependencies":["@keystone-alpha/core","@keystone-alpha/adapter-mongoose"]},{"name":"@keystone-alpha/cypress-project-twitter-login","type":"patch","dependencies":["@keystone-alpha/core","@keystone-alpha/adapter-mongoose"]}]}
---
```

Expand Down Expand Up @@ -59,7 +59,7 @@ To demonstrate, imagine you have the following two changesets:
...
Summary: Fixed a bug that caused relationships to be added twice
Releases: @voussoir/core@minor, @voussoir/adapter-mongoose@patch
Releases: @keystone-alpha/core@minor, @keystone-alpha/adapter-mongoose@patch
...
```

Expand All @@ -69,7 +69,7 @@ and the second changest:
...
Summary: Converted functions to arrow functions for some reason
Releases: @voussoir/core@patch
Releases: @keystone-alpha/core@patch
...
```

Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Some quick house rules:
### Setup

```
npm install --save @voussoir/keystone @voussoir/fields @voussoir/adapter-mongoose @voussoir/admin-ui
npm install --save @keystone-alpha/keystone @keystone-alpha/fields @keystone-alpha/adapter-mongoose @keystone-alpha/admin-ui
```

_NOTE: You must have a [working version of `mongo`
Expand All @@ -53,10 +53,10 @@ Create a file `index.js`:

<!-- prettier-ignore -->
```javascript
const { Keystone } = require('@voussoir/keystone');
const { AdminUI } = require('@voussoir/admin-ui');
const { MongooseAdapter } = require('@voussoir/adapter-mongoose');
const { Text } = require('@voussoir/fields');
const { Keystone } = require('@keystone-alpha/keystone');
const { AdminUI } = require('@keystone-alpha/admin-ui');
const { MongooseAdapter } = require('@keystone-alpha/adapter-mongoose');
const { Text } = require('@keystone-alpha/fields');

const keystone = new Keystone({
name: 'Keystone To-Do List',
Expand Down Expand Up @@ -122,7 +122,7 @@ Create the `server.js` file:

<!-- prettier-ignore -->
```javascript
const keystoneServer = require('@voussoir/core');
const keystoneServer = require('@keystone-alpha/core');

keystoneServer.prepare({ port: 3000 })
.then(({ server, keystone }) => {
Expand Down Expand Up @@ -228,10 +228,10 @@ list used for authentication in `index.js`:

<!-- prettier-ignore -->
```javascript
const { Keystone } = require('@voussoir/keystone');
const { MongooseAdapter } = require('@voussoir/adapter-mongoose');
const { Text, Password } = require('@voussoir/fields');
const PasswordAuth = require('@voussoir/keystone/auth/Password');
const { Keystone } = require('@keystone-alpha/keystone');
const { MongooseAdapter } = require('@keystone-alpha/adapter-mongoose');
const { Text, Password } = require('@keystone-alpha/fields');
const PasswordAuth = require('@keystone-alpha/keystone/auth/Password');

const keystone = new Keystone({
name: 'Keystone With Auth',
Expand Down
12 changes: 6 additions & 6 deletions demo-projects/blog/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//imports for Keystone app core
const { AdminUI } = require('@voussoir/admin-ui');
const { Keystone } = require('@voussoir/keystone');
const { AdminUI } = require('@keystone-alpha/admin-ui');
const { Keystone } = require('@keystone-alpha/keystone');
const {
File,
Text,
Expand All @@ -10,10 +10,10 @@ const {
Checkbox,
CalendarDay,
DateTime,
} = require('@voussoir/fields');
const { LocalFileAdapter } = require('@voussoir/file-adapters');
const PasswordAuthStrategy = require('@voussoir/keystone/auth/Password');
const { MongooseAdapter } = require('@voussoir/adapter-mongoose');
} = require('@keystone-alpha/fields');
const { LocalFileAdapter } = require('@voukeystone-alphassoir/file-adapters');
const PasswordAuthStrategy = require('@keystone-alpha/keystone/auth/Password');
const { MongooseAdapter } = require('@keystone-alpha/adapter-mongoose');

// config
const path = require('path');
Expand Down
18 changes: 9 additions & 9 deletions demo-projects/blog/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "keystone_demo_blog",
"private": true,
"version": "2.0.0",
"version": "0.0.0",
"author": "Nathan Simpson",
"license": "MIT",
"engines": {
Expand All @@ -14,13 +14,13 @@
"dependencies": {
"@emotion/core": "^10.0.4",
"@emotion/styled": "^10.0.4",
"@voussoir/adapter-mongoose": "^2.0.1",
"@voussoir/admin-ui": "^1.0.1",
"@voussoir/core": "^3.0.0",
"@voussoir/fields": "^3.1.0",
"@voussoir/file-adapters": "^0.2.1",
"@voussoir/keystone": "^1.0.0",
"@voussoir/server": "^1.1.0",
"@keystone-alpha/adapter-mongoose": "^0.0.0",
"@keystone-alpha/admin-ui": "^0.0.0",
"@keystone-alpha/core": "^0.0.0",
"@keystone-alpha/fields": "^0.0.0",
"@keystone-alpha/file-adapters": "^0.0.0",
"@keystone-alpha/keystone": "^0.0.0",
"@keystone-alpha/server": "^0.0.0",
"apollo-cache-inmemory": "^1.5.1",
"apollo-client": "^2.5.1",
"apollo-link-http": "^1.5.11",
Expand All @@ -33,4 +33,4 @@
"react": "^16.8.0",
"react-apollo": "^2.2.4"
}
}
}
2 changes: 1 addition & 1 deletion demo-projects/blog/server.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const keystone = require('@voussoir/core');
const keystone = require('@keystone-alpha/core');
const next = require('next');

const { staticRoute, staticPath } = require('./index');
Expand Down
2 changes: 2 additions & 0 deletions demo-projects/todo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# @keystone-alpha/demo-project-todo

# @voussoir/demo-project-todo

## 2.0.0
Expand Down
8 changes: 4 additions & 4 deletions demo-projects/todo/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { Keystone } = require('@voussoir/keystone');
const { AdminUI } = require('@voussoir/admin-ui');
const { MongooseAdapter } = require('@voussoir/adapter-mongoose');
const { Text } = require('@voussoir/fields');
const { Keystone } = require('@keystone-alpha/keystone');
const { AdminUI } = require('@keystone-alpha/admin-ui');
const { MongooseAdapter } = require('@keystone-alpha/adapter-mongoose');
const { Text } = require('@keystone-alpha/fields');

const keystone = new Keystone({
name: 'Keystone To-Do List',
Expand Down
18 changes: 9 additions & 9 deletions demo-projects/todo/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@voussoir/demo-project-todo",
"name": "@keystone-alpha/demo-project-todo",
"private": true,
"version": "2.0.0",
"version": "0.0.0",
"author": "Nathan Simpson",
"license": "MIT",
"engines": {
Expand All @@ -11,12 +11,12 @@
"start": "DISABLE_LOGGING=true keystone --entry=index.js"
},
"dependencies": {
"@voussoir/adapter-mongoose": "^2.0.1",
"@voussoir/admin-ui": "^1.0.1",
"@voussoir/core": "^3.0.0",
"@voussoir/fields": "^3.1.0",
"@voussoir/keystone": "^1.0.0",
"@voussoir/server": "^1.1.0",
"@keystone-alpha/adapter-mongoose": "^0.0.0",
"@keystone-alpha/admin-ui": "^0.0.0",
"@keystone-alpha/core": "^0.0.0",
"@keystone-alpha/fields": "^0.0.0",
"@keystone-alpha/keystone": "^0.0.0",
"@keystone-alpha/server": "^0.0.0",
"express": "^4.16.3"
}
}
}
2 changes: 1 addition & 1 deletion demo-projects/todo/server.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const keystone = require('@voussoir/core');
const keystone = require('@keystone-alpha/core');
const express = require('express');
const path = require('path');

Expand Down
4 changes: 2 additions & 2 deletions docs/authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ First, setup [a `PasswordAuthStrategy` instance](#passwordauthstrategy).
Then, pass that instance into the Web Server setup:

```javascript
const { WebServer } = require('@voussoir/server');
const PasswordAuthStrategy = require('@voussoir/keystone/auth/Password');
const { WebServer } = require('@keystone-alpha/server');
const PasswordAuthStrategy = require('@keystone-alpha/keystone/auth/Password');

const keystone = // ...

Expand Down
2 changes: 1 addition & 1 deletion docs/performance.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Query Performance Monitoring with Apollo Engine

The GraphQL stack in Voussoir is powered by [Apollo Server](https://www.apollographql.com/docs/apollo-server/),
The GraphQL stack in keystone-alpha is powered by [Apollo Server](https://www.apollographql.com/docs/apollo-server/),
which comes with performance monitoring built in via the [Apollo Engine](https://engine.apollographql.com).

Apollo Engine provides a free service up to 25 million monthly requests,
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@voussoir/mono-repo",
"name": "@keystone-alpha/mono-repo",
"version": "5.0.0",
"author": "Jed Watson",
"license": "MIT",
"scripts": {
"coverage": "DISABLE_LOGGING=true NODE_ENV=test jest --maxWorkers=1 --coverage",
"cypress:run": "status=0; bolt w @voussoir/cypress-project-basic run cypress:run || status=$?; bolt w @voussoir/cypress-project-login run cypress:run || status=$?; bolt w @voussoir/cypress-project-twitter-login run cypress:run || status=$?; bolt w @voussoir/cypress-project-access-control run cypress:run || status=$?; exit $status",
"cypress:run": "status=0; bolt w @keystone-alpha/cypress-project-basic run cypress:run || status=$?; bolt w @keystone-alpha/cypress-project-login run cypress:run || status=$?; bolt w @keystone-alpha/cypress-project-twitter-login run cypress:run || status=$?; bolt w @keystone-alpha/cypress-project-access-control run cypress:run || status=$?; exit $status",
"format:file": "prettier --write",
"format": "prettier --write \"**/*.js{,on}\" \"**/*.md\"",
"fresh": "yarn clean && bolt",
Expand Down
2 changes: 2 additions & 0 deletions packages/access-control/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# @keystone-alpha/access-control

# @voussoir/access-control

## 0.4.2
Expand Down
2 changes: 1 addition & 1 deletion packages/access-control/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getType, pick, defaultObj } = require('@voussoir/utils');
const { getType, pick, defaultObj } = require('@keystone-alpha/utils');

const validateGranularConfigTypes = (longHandAccess, validationError) => {
const errors = Object.entries(longHandAccess)
Expand Down
6 changes: 3 additions & 3 deletions packages/access-control/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@voussoir/access-control",
"version": "0.4.2",
"name": "@keystone-alpha/access-control",
"version": "0.0.0",
"author": "Jess Telford",
"license": "MIT",
"engines": {
"node": ">=8.4.0"
},
"dependencies": {
"@voussoir/utils": "^1.0.0"
"@keystone-alpha/utils": "^0.0.0"
}
}
2 changes: 2 additions & 0 deletions packages/adapter-knex/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# @keystone-alpha/adapter-knex

# @voussoir/adapter-knex

## 0.0.3
Expand Down
4 changes: 2 additions & 2 deletions packages/adapter-knex/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const {
BaseKeystoneAdapter,
BaseListAdapter,
BaseFieldAdapter,
} = require('@voussoir/keystone/adapters');
} = require('@keystone-alpha/keystone/adapters');
const {
objMerge,
flatten,
Expand All @@ -14,7 +14,7 @@ const {
arrayToObject,
resolveAllKeys,
identity,
} = require('@voussoir/utils');
} = require('@keystone-alpha/utils');

class KnexAdapter extends BaseKeystoneAdapter {
constructor() {
Expand Down
10 changes: 5 additions & 5 deletions packages/adapter-knex/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@voussoir/adapter-knex",
"version": "0.0.3",
"name": "@keystone-alpha/adapter-knex",
"version": "0.0.0",
"author": "Tim Leslie",
"license": "MIT",
"engines": {
"node": ">=8.4.0"
},
"dependencies": {
"@voussoir/keystone": "^1.0.0",
"@voussoir/utils": "^1.0.0",
"@keystone-alpha/keystone": "^0.0.0",
"@keystone-alpha/utils": "^0.0.0",
"knex": "^0.16.3",
"p-settle": "^2.1.0",
"pg": "^7.8.0"
}
}
}
2 changes: 2 additions & 0 deletions packages/adapter-mongoose/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# @keystone-alpha/adapter-mongoose

# @voussoir/adapter-mongoose

## 2.0.1
Expand Down
15 changes: 11 additions & 4 deletions packages/adapter-mongoose/index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
const mongoose = require('mongoose');
const inflection = require('inflection');
const pSettle = require('p-settle');
const { escapeRegExp, pick, getType, mapKeys, mapKeyNames, identity } = require('@voussoir/utils');
const {
escapeRegExp,
pick,
getType,
mapKeys,
mapKeyNames,
identity,
} = require('@keystone-alpha/utils');

const {
BaseKeystoneAdapter,
BaseListAdapter,
BaseFieldAdapter,
} = require('@voussoir/keystone/adapters');
const joinBuilder = require('@voussoir/mongo-join-builder');
const logger = require('@voussoir/logger')('mongoose');
} = require('@keystone-alpha/keystone/adapters');
const joinBuilder = require('@keystone-alpha/mongo-join-builder');
const logger = require('@keystone-alpha/logger')('mongoose');

const simpleTokenizer = require('./tokenizers/simple');
const relationshipTokenizer = require('./tokenizers/relationship');
Expand Down
Loading

0 comments on commit 8b6734a

Please sign in to comment.