Skip to content

Commit

Permalink
wip: fix dependencies for yarn workspaces
Browse files Browse the repository at this point in the history
  • Loading branch information
timsuchanek committed Jan 24, 2018
1 parent 677d748 commit 5453a3d
Show file tree
Hide file tree
Showing 8 changed files with 352 additions and 54 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ project/plugins/project/
/docker.env

# buildkite artifacts
buildkite-script-*
buildkite-script-*
.envrc
18 changes: 8 additions & 10 deletions cli/packages/prisma-cli-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prisma-cli-core",
"version": "1.0.1",
"version": "1.0.2",
"main": "dist/index.js",
"files": [
"dist"
Expand All @@ -10,21 +10,21 @@
"license": "Apache-2.0",
"devDependencies": {
"@types/aws-lambda": "^0.0.17",
"@types/fs-extra": "^4.0.2",
"@types/fs-extra": "^5.0.0",
"@types/graphql": "^0.11.7",
"@types/node": "^8.0.22",
"faker": "^4.1.0",
"husky": "^0.14.3",
"jest": "^21.0.2",
"lint-staged": "^4.2.3",
"nock": "^9.0.14",
"prettier": "^1.5.3",
"prettier": "^1.10.2",
"rimraf": "^2.6.1",
"ts-jest": "^21.0.0",
"tslint": "^5.6.0",
"tslint-config-prettier": "^1.3.0",
"tslint-eslint-rules": "^4.1.1",
"typescript": "^2.5.3",
"typescript": "^2.6.2",
"watch-cli": "^0.2.3"
},
"engines": {
Expand Down Expand Up @@ -77,19 +77,19 @@
"dependencies": {
"archiver": "^2.0.3",
"callsites": "^2.0.0",
"chalk": "^2.2.0",
"chalk": "^2.3.0",
"chokidar": "^1.7.0",
"copy-paste": "^1.3.0",
"cross-spawn": "^5.1.0",
"download-github-repo": "^0.1.3",
"figures": "^2.0.0",
"find-up": "^2.1.0",
"fs-extra": "^4.0.2",
"fs-extra": "^5.0.0",
"globby": "^6.1.0",
"graphcool-inquirer": "^1.0.3",
"graphql": "^0.11.7",
"graphql-cli": "2.12.2",
"graphql-config": "^1.0.9",
"graphql-config": "^1.1.7",
"inquirer": "^3.3.0",
"isomorphic-fetch": "^2.2.1",
"js-yaml": "^3.9.1",
Expand All @@ -103,14 +103,12 @@
"pause": "^0.1.0",
"portfinder": "^1.0.13",
"prisma-json-schema": "^0.0.1",
"prisma-yml": "1.0.1",
"prisma-yml": "1.0.11-11",
"scuid": "^1.0.2",
"semver": "^5.4.1",
"sillyname": "^0.1.0",
"source-map-support": "^0.4.18",
"table": "^4.0.1",
"ts-node": "^3.3.0",
"typescript": "^2.5.3",
"unzip": "^0.1.11",
"util.promisify": "^1.0.0",
"validator": "^8.2.0"
Expand Down
43 changes: 27 additions & 16 deletions cli/packages/prisma-cli-engine/package.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
{
"name": "prisma-cli-engine",
"version": "1.0.1",
"version": "1.0.3-0",
"main": "dist/index.js",
"files": ["dist"],
"files": [
"dist"
],
"typings": "dist/index.d.ts",
"author": "Tim Suchanek <tim@graph.cool>",
"license": "Apache-2.0",
"devDependencies": {
"@types/fs-extra": "^5.0.0",
"@types/jest": "^20.0.8",
"@types/lodash": "^4.14.77",
"@types/node": "^8.0.22",
"husky": "^0.14.3",
"jest": "^21.2.1",
"lint-staged": "^4.2.3",
"nock": "^9.0.14",
"prettier": "^1.5.3",
"prettier": "^1.10.2",
"rimraf": "^2.6.1",
"ts-jest": "^21.0.0",
"tslint": "^5.6.0",
"tslint-config-prettier": "^1.3.0",
"tslint-eslint-rules": "^4.1.1",
"typescript": "^2.4.2",
"typescript": "^2.6.2",
"watch-cli": "^0.2.3"
},
"scripts": {
"build": "tsc -d",
"lint": "tslint src/**/*.ts",
"precommit": "lint-staged",
"watch": "../../node_modules/.bin/watch -p 'src/**/*.*' -c 'yarn build'",
"prettier":
"prettier --single-quote --no-semi --trailing-comma all --write '*.ts' 'src/**/*.ts'",
"prepublishOnly": "yarn link && yarn test && yarn build",
"prettier": "prettier --single-quote --no-semi --trailing-comma all --write '*.ts' 'src/**/*.ts'",
"prepublishOnly": "yarn lint && yarn test && yarn build",
"test": "npm run lint && jest"
},
"lint-staged": {
Expand All @@ -45,13 +47,23 @@
]
},
"jest": {
"moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json"],
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"jsx",
"json"
],
"rootDir": "./src",
"transform": {
"^.+\\.(ts|tsx)$": "../../../node_modules/ts-jest/preprocessor.js"
},
"testMatch": ["**/*.test.(ts|js)"],
"setupFiles": ["../test/init.js"],
"testMatch": [
"**/*.test.(ts|js)"
],
"setupFiles": [
"../test/init.js"
],
"globals": {
"ts-jest": {
"tsConfigFile": "./tsconfig.json"
Expand All @@ -60,21 +72,20 @@
},
"dependencies": {
"@heroku/linewrap": "^1.0.0",
"@types/fs-extra": "^4.0.2",
"ajv": "^5.2.2",
"ajv": "5",
"ansi-escapes": "^3.0.0",
"ansi-styles": "^3.2.0",
"bluebird": "^3.5.0",
"cache-require-paths": "^0.3.0",
"callsites": "^2.0.0",
"cardinal": "^1.0.0",
"chalk": "^2.2.0",
"chalk": "^2.3.0",
"charm": "^1.0.2",
"debug": "^3.0.1",
"debug": "^3.1.0",
"directory-tree": "^2.0.0",
"dotenv": "^4.0.0",
"find-up": "^2.1.0",
"fs-extra": "^4.0.2",
"fs-extra": "^5.0.0",
"graphcool-inquirer": "^1.0.3",
"graphql-request": "^1.3.4",
"isomorphic-fetch": "^2.2.1",
Expand All @@ -99,7 +110,7 @@
"memfs": "^2.5.3",
"opn": "^5.1.0",
"prisma-json-schema": "^0.0.1",
"prisma-yml": "1.0.1",
"prisma-yml": "1.0.11-12",
"raven": "2.3.0",
"replaceall": "^0.1.6",
"rwlockfile": "^1.4.8",
Expand Down
2 changes: 1 addition & 1 deletion cli/packages/prisma-cli-engine/src/commands/help.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ ${chalk.bold('Usage:')} ${chalk.bold('prisma')} COMMAND`)
continue
}
const list: string[][][] = (await Promise.all(
groupTopics.map(async t => {
groupTopics.map(async (t: any) => {
const cmds = await this.plugins.commandsForTopic(t.id)
// console.log(cmds)
// if (t.id === 'local') {
Expand Down
28 changes: 19 additions & 9 deletions cli/packages/prisma-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"name": "prisma",
"description":
"Prisma is a realtime GraphQL database layer. Connect directly from the frontend or build your own GraphQL server.",
"keywords": ["prisma", "graphql", "backend", "deployment", "api", "server"],
"description": "Prisma is a realtime GraphQL database layer. Connect directly from the frontend or build your own GraphQL server.",
"keywords": [
"prisma",
"graphql",
"backend",
"deployment",
"api",
"server"
],
"homepage": "https://github.com/graphcool/prisma",
"repository": {
"type": "git",
Expand All @@ -16,15 +22,18 @@
"bin": {
"prisma": "dist/index.js"
},
"files": ["dist"],
"files": [
"dist"
],
"typings": "dist/index.d.ts",
"author": "Tim Suchanek <tim@graph.cool>",
"license": "Apache-2.0",
"devDependencies": {
"@types/fs-extra": "^5.0.0",
"@types/node": "^8.0.22",
"husky": "^0.14.3",
"lint-staged": "^4.0.3",
"prettier": "^1.5.3",
"prettier": "^1.10.2",
"rimraf": "^2.6.1",
"tslint": "^5.6.0",
"tslint-config-prettier": "^1.3.0",
Expand All @@ -35,16 +44,17 @@
"build": "rimraf dist && tsc -d && chmod +x dist/index.js",
"lint": "tslint src/**/*.ts",
"precommit": "lint-staged",
"prettier":
"prettier --single-quote --no-semi --trailing-comma all --write '*.ts' 'src/**/*.ts'",
"prettier": "prettier --single-quote --no-semi --trailing-comma all --write '*.ts' 'src/**/*.ts'",
"prepublishOnly": "npm run lint && npm run build"
},
"cli-engine": {
"bin": "prisma",
"dirname": "prisma",
"node": "6.0.0",
"defaultCommand": "help",
"plugins": ["prisma-cli-core"]
"plugins": [
"prisma-cli-core"
]
},
"lint-staged": {
"*.ts": [
Expand All @@ -55,7 +65,7 @@
"gitDir": "../../"
},
"dependencies": {
"fs-extra": "^4.0.1",
"fs-extra": "^5.0.0",
"prisma-cli-core": "1.0.1",
"prisma-cli-engine": "1.0.1",
"semver": "^5.4.1",
Expand Down
10 changes: 5 additions & 5 deletions cli/packages/prisma-yml/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prisma-yml",
"version": "1.0.1",
"version": "1.0.11-12",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"repository": {
Expand All @@ -11,21 +11,21 @@
],
"license": "Apache-2.0",
"devDependencies": {
"@types/fs-extra": "^4.0.5",
"@types/fs-extra": "^5.0.0",
"@types/jest": "^21.1.8",
"@types/node": "^8.0.57",
"jest": "^21.2.1",
"prettier": "^1.9.1",
"prettier": "^1.10.2",
"ts-jest": "^21.2.4",
"typescript": "^2.6.2"
},
"dependencies": {
"ajv": "^5.5.1",
"ajv": "5",
"bluebird": "^3.5.1",
"chalk": "^2.3.0",
"debug": "^3.1.0",
"dotenv": "^4.0.0",
"fs-extra": "^4.0.3",
"fs-extra": "^5.0.0",
"isomorphic-fetch": "^2.2.1",
"js-yaml": "^3.10.0",
"json-stable-stringify": "^1.0.1",
Expand Down
Loading

0 comments on commit 5453a3d

Please sign in to comment.