Skip to content

Commit

Permalink
merge from master
Browse files Browse the repository at this point in the history
  • Loading branch information
NickBolles committed Sep 4, 2019
2 parents 3d86793 + 836739d commit 4ccd5c8
Show file tree
Hide file tree
Showing 44 changed files with 3,619 additions and 2,397 deletions.
11 changes: 5 additions & 6 deletions examples/accounts-boost/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@examples/accounts-boost",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"main": "lib/index.js",
"license": "MIT",
"scripts": {
Expand All @@ -13,12 +13,12 @@
"test": "yarn build"
},
"dependencies": {
"@accounts/boost": "^0.18.0",
"@accounts/boost": "^0.19.0",
"apollo-link-context": "1.0.18",
"apollo-link-http": "1.5.15",
"apollo-server": "2.7.1",
"graphql": "14.4.2",
"graphql-toolkit": "0.4.1",
"apollo-server": "2.9.0",
"graphql": "14.5.3",
"graphql-toolkit": "0.5.10",
"graphql-tools": "4.0.5",
"lodash": "4.17.15",
"node-fetch": "2.6.0",
Expand All @@ -28,7 +28,6 @@
"@accounts/tslint-config-accounts": "0.0.9",
"nodemon": "1.19.1",
"ts-node": "8.3.0",
"tslint": "^5.12.1",
"typescript": "3.5.3"
}
}
25 changes: 12 additions & 13 deletions examples/graphql-server-typeorm-postgres/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@examples/graphql-typeorm-typescript",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"main": "lib/index.js",
"license": "Unlicensed",
"scripts": {
Expand All @@ -13,21 +13,20 @@
"test": "yarn build"
},
"dependencies": {
"@accounts/graphql-api": "^0.18.0",
"@accounts/password": "^0.18.0",
"@accounts/server": "^0.18.0",
"@accounts/typeorm": "^0.18.0",
"@graphql-modules/core": "0.7.8",
"apollo-server": "2.7.1",
"graphql": "14.4.2",
"graphql-toolkit": "0.4.1",
"pg": "7.11.0",
"@accounts/graphql-api": "^0.19.0",
"@accounts/password": "^0.19.0",
"@accounts/server": "^0.19.0",
"@accounts/typeorm": "^0.19.0",
"@graphql-modules/core": "0.7.10",
"apollo-server": "2.9.0",
"graphql": "14.5.3",
"graphql-toolkit": "0.5.10",
"pg": "7.12.1",
"typeorm": "0.2.18"
},
"devDependencies": {
"@accounts/types": "^0.18.0",
"@types/graphql": "14.2.3",
"@types/node": "12.6.8",
"@accounts/types": "^0.19.0",
"@types/node": "12.7.2",
"nodemon": "1.19.1",
"ts-node": "8.3.0",
"typescript": "3.5.3"
Expand Down
28 changes: 14 additions & 14 deletions examples/graphql-server-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@examples/graphql-server-typescript",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"main": "lib/index.js",
"license": "MIT",
"scripts": {
Expand All @@ -10,24 +10,24 @@
"test": "yarn build"
},
"dependencies": {
"@accounts/database-manager": "^0.18.0",
"@accounts/graphql-api": "^0.18.0",
"@accounts/mongo": "^0.18.0",
"@accounts/password": "^0.18.0",
"@accounts/rest-express": "^0.18.0",
"@accounts/server": "^0.18.0",
"@graphql-modules/core": "0.7.8",
"apollo-server": "2.8.0",
"graphql": "14.4.2",
"graphql-toolkit": "0.4.1",
"@accounts/database-manager": "^0.19.0",
"@accounts/graphql-api": "^0.19.0",
"@accounts/mongo": "^0.19.0",
"@accounts/password": "^0.19.0",
"@accounts/rest-express": "^0.19.0",
"@accounts/server": "^0.19.0",
"@graphql-modules/core": "0.7.10",
"apollo-server": "2.9.0",
"graphql": "14.5.3",
"graphql-toolkit": "0.5.10",
"graphql-tools": "4.0.5",
"lodash": "4.17.15",
"mongoose": "5.6.7",
"mongoose": "5.6.11",
"tslib": "1.10.0"
},
"devDependencies": {
"@types/mongoose": "5.5.11",
"@types/node": "12.6.8",
"@types/mongoose": "5.5.13",
"@types/node": "12.7.2",
"nodemon": "1.19.1",
"ts-node": "8.3.0",
"typescript": "3.5.3"
Expand Down
28 changes: 14 additions & 14 deletions examples/react-graphql-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@examples/react-graphql-typescript",
"version": "0.18.0",
"version": "0.19.0",
"private": true,
"scripts": {
"start": "SKIP_PREFLIGHT_CHECK=true react-scripts start",
Expand All @@ -24,28 +24,28 @@
]
},
"dependencies": {
"@accounts/client": "^0.18.0",
"@accounts/client-password": "^0.18.0",
"@accounts/graphql-client": "^0.18.0",
"@material-ui/core": "4.3.0",
"@material-ui/styles": "4.3.0",
"@accounts/client": "^0.19.0",
"@accounts/client-password": "^0.19.0",
"@accounts/graphql-client": "^0.19.0",
"@material-ui/core": "4.3.3",
"@material-ui/styles": "4.3.3",
"apollo-boost": "0.1.27",
"graphql": "14.4.2",
"graphql": "14.5.3",
"qrcode.react": "0.9.3",
"react": "16.8.6",
"react": "16.9.0",
"react-apollo": "2.5.8",
"react-dom": "16.8.6",
"react-dom": "16.9.0",
"react-router-dom": "5.0.1",
"tslib": "1.10.0"
},
"devDependencies": {
"@types/node": "12.6.8",
"@types/node": "12.7.2",
"@types/qrcode.react": "0.8.2",
"@types/react": "16.8.23",
"@types/react-dom": "16.8.5",
"@types/react": "16.9.2",
"@types/react-dom": "16.9.0",
"@types/react-router": "5.0.3",
"@types/react-router-dom": "4.3.4",
"react-scripts": "3.0.1",
"@types/react-router-dom": "4.3.5",
"react-scripts": "3.1.1",
"typescript": "3.5.3"
}
}
26 changes: 13 additions & 13 deletions examples/react-rest-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@examples/react-rest-typescript",
"version": "0.18.0",
"version": "0.19.0",
"private": true,
"scripts": {
"start": "SKIP_PREFLIGHT_CHECK=true react-scripts start",
Expand All @@ -24,25 +24,25 @@
]
},
"dependencies": {
"@accounts/client": "^0.18.0",
"@accounts/client-password": "^0.18.0",
"@accounts/rest-client": "^0.18.0",
"@material-ui/core": "4.3.0",
"@material-ui/styles": "4.3.0",
"@accounts/client": "^0.19.0",
"@accounts/client-password": "^0.19.0",
"@accounts/rest-client": "^0.19.0",
"@material-ui/core": "4.3.3",
"@material-ui/styles": "4.3.3",
"qrcode.react": "0.9.3",
"react": "16.8.6",
"react-dom": "16.8.6",
"react": "16.9.0",
"react-dom": "16.9.0",
"react-router-dom": "5.0.1",
"tslib": "1.10.0"
},
"devDependencies": {
"@types/node": "12.6.8",
"@types/node": "12.7.2",
"@types/qrcode.react": "0.8.2",
"@types/react": "16.8.23",
"@types/react-dom": "16.8.5",
"@types/react": "16.9.2",
"@types/react-dom": "16.9.0",
"@types/react-router": "5.0.3",
"@types/react-router-dom": "4.3.4",
"react-scripts": "3.0.1",
"@types/react-router-dom": "4.3.5",
"react-scripts": "3.1.1",
"typescript": "3.5.3"
}
}
14 changes: 7 additions & 7 deletions examples/rest-express-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@examples/rest-express-typescript",
"private": true,
"version": "0.18.0",
"version": "0.19.0",
"main": "lib/index.js",
"license": "MIT",
"scripts": {
Expand All @@ -10,18 +10,18 @@
"test": "yarn build"
},
"dependencies": {
"@accounts/mongo": "^0.18.0",
"@accounts/password": "^0.18.0",
"@accounts/rest-express": "^0.18.0",
"@accounts/server": "^0.18.0",
"@accounts/mongo": "^0.19.0",
"@accounts/password": "^0.19.0",
"@accounts/rest-express": "^0.19.0",
"@accounts/server": "^0.19.0",
"body-parser": "1.19.0",
"cors": "2.8.5",
"express": "4.17.1",
"mongoose": "5.6.6",
"mongoose": "5.6.11",
"tslib": "1.10.0"
},
"devDependencies": {
"@types/node": "12.6.8",
"@types/node": "12.7.2",
"nodemon": "1.19.1",
"ts-node": "8.3.0",
"typescript": "3.5.3"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"lerna": "2.11.0",
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.18.0"
"version": "0.19.0"
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"printWidth": 100
},
"resolutions": {
"@types/node": "12.6.8",
"@types/node": "12.7.2",
"graphql-tools": "4.0.5"
},
"renovate": {
Expand All @@ -65,13 +65,13 @@
"devDependencies": {
"@accounts/tslint-config-accounts": "0.0.9",
"codecov": "3.5.0",
"husky": "3.0.1",
"lerna": "2.11.0",
"lint-staged": "9.2.1",
"husky": "3.0.4",
"lerna": "3.16.4",
"lint-staged": "9.2.5",
"opencollective": "1.0.3",
"prettier": "1.18.2",
"ts-jest": "24.0.2",
"tslint": "5.16.0",
"tslint": "5.19.0",
"typescript": "3.5.3"
},
"collective": {
Expand Down
6 changes: 3 additions & 3 deletions packages/apollo-link-accounts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accounts/apollo-link",
"version": "0.18.0",
"version": "0.19.0",
"description": "Apollo link for account-js",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand All @@ -20,9 +20,9 @@
},
"license": "MIT",
"devDependencies": {
"@accounts/client": "^0.18.0",
"@accounts/client": "^0.19.0",
"apollo-link": "1.2.12",
"rimraf": "2.6.3"
"rimraf": "3.0.0"
},
"dependencies": {
"apollo-link-context": "1.0.18",
Expand Down
18 changes: 9 additions & 9 deletions packages/boost/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accounts/boost",
"version": "0.18.0",
"version": "0.19.0",
"description": "Ready to use GraphQL accounts server",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand All @@ -20,16 +20,16 @@
},
"license": "MIT",
"devDependencies": {
"rimraf": "2.6.3"
"rimraf": "3.0.0"
},
"dependencies": {
"@accounts/database-manager": "^0.18.0",
"@accounts/graphql-api": "^0.18.0",
"@accounts/server": "^0.18.0",
"@accounts/types": "^0.18.0",
"@graphql-modules/core": "0.7.9",
"apollo-server": "^2.7.1",
"graphql": "^14.3.1",
"@accounts/database-manager": "^0.19.0",
"@accounts/graphql-api": "^0.19.0",
"@accounts/server": "^0.19.0",
"@accounts/types": "^0.19.0",
"@graphql-modules/core": "0.7.10",
"apollo-server": "^2.9.0",
"graphql": "^14.5.3",
"graphql-tools": "^4.0.5",
"jsonwebtoken": "^8.5.1",
"lodash": "^4.17.15",
Expand Down
Loading

0 comments on commit 4ccd5c8

Please sign in to comment.