Skip to content

Commit

Permalink
fix: Dep Update
Browse files Browse the repository at this point in the history
  • Loading branch information
William Luke committed Nov 1, 2019
1 parent 9d1583f commit bd3e466
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 57 deletions.
78 changes: 37 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,67 +20,63 @@
"yoga": "dist/cli/index.js"
},
"dependencies": {
"@types/ora": "^3.2.0",
"apollo-server-express": "^2.4.8",
"apollo-server-express": "^2.9.7",
"chalk": "^2.4.2",
"decache": "^4.5.1",
"dotenv": "^7.0.0",
"execa": "^1.0.0",
"express": "^4.16.4",
"dotenv": "^8.2.0",
"execa": "^3.2.0",
"express": "^4.17.1",
"graphql": "^0.12.0 || ^0.13.0 || ^14.0.0",
"graphql-middleware": "^3.0.2",
"graphql-shield": "^5.3.4",
"graphql-upload": "^8.0.5",
"inquirer": "^6.3.1",
"graphql-middleware": "^4.0.1",
"graphql-shield": "^7.0.0",
"graphql-upload": "^8.1.0",
"inquirer": "^6.5.0",
"inquirer-path": "^1.0.0-beta5",
"js-yaml": "^3.13.1",
"meow": "^5.0.0",
"nexus": "0.11.6",
"nexus": "0.11.7",
"nexus-prisma": "0.3.5",
"node-watch": "^0.6.2",
"ora": "^3.4.0",
"node-watch": "^0.6.3",
"ora": "^4.0.2",
"parse-github-url": "^1.0.2",
"pkginfo": "^0.4.1",
"pluralize": "^7.0.0",
"prettier": "^1.17.0",
"pretty-error": "2.2.0-rc.1",
"prisma-datamodel": "^1.34.6",
"prisma-generate-schema": "^1.34.6",
"pluralize": "^8.0.0",
"prettier": "^1.18.2",
"pretty-error": "2.1.1",
"prisma-datamodel": "^1.34.10",
"prisma-generate-schema": "^1.34.10",
"prisma-json-schema": "^0.1.3",
"request": "^2.88.0",
"tar": "^4.4.8",
"ts-node": "^8.1.0",
"tar": "^5.0.5",
"ts-node": "^8.4.1",
"typescript": "3.4.5",
"yargs": "^13.2.2"
"yargs": "^14.2.0"
},
"devDependencies": {
"@types/dotenv": "^6.1.1",
"@types/execa": "^0.9.0",
"@types/express": "4.16.1",
"@types/graphql": "14.2.0",
"@types/inquirer": "6.0.0",
"@types/express": "4.17.1",
"@types/inquirer": "^6.5.0",
"@types/js-yaml": "3.12.1",
"@types/meow": "^5.0.0",
"@types/node": "10.14.1",
"@types/node": "12.12.3",
"@types/parse-github-url": "^1.0.0",
"@types/pluralize": "0.0.29",
"@types/prettier": "^1.16.2",
"@types/request": "^2.48.1",
"@types/rimraf": "^2.0.2",
"@types/tar": "^4.0.0",
"@types/prettier": "^1.18.3",
"@types/request": "^2.48.3",
"@types/rimraf": "^2.0.3",
"@types/tar": "^4.0.3",
"@types/tmp": "^0.1.0",
"@types/yargs": "13.0.0",
"@types/yargs": "13.0.3",
"@typescript-eslint/eslint-plugin": "^1.6.0",
"@typescript-eslint/parser": "^1.6.0",
"dotenv-cli": "^2.0.0",
"eslint": "^5.16.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^4.1.0",
"eslint-plugin-graphql": "^3.0.3",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-prettier": "^3.0.1",
"semantic-release": "^15.13.3",
"semantic-release-cli": "^4.1.2"
"@typescript-eslint/parser": "^2.6.0",
"dotenv-cli": "^3.0.0",
"eslint": "^6.6.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.5.0",
"eslint-plugin-graphql": "^3.1.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-prettier": "^3.1.1",
"semantic-release": "^15.13.28",
"semantic-release-cli": "^5.2.2"
},
"prettier": {
"semi": false,
Expand Down
20 changes: 10 additions & 10 deletions src/cli/commands/new/loader.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import * as tar from 'tar'
import * as tmp from 'tmp'
import github from 'parse-github-url'
import chalk from 'chalk'
import execa from 'execa'
import * as fs from 'fs'
import ora from 'ora'
import github from 'parse-github-url'
import request from 'request'
import execa from 'execa'
import chalk from 'chalk'

import { Template } from './templates'
import * as tar from 'tar'
import * as tmp from 'tmp'
import * as logger from '../../../logger'
import { Template } from './templates'


export interface LoadOptions {
installDependencies: boolean
Expand Down Expand Up @@ -102,9 +102,9 @@ export async function installYogaStarter(path: string): Promise<void> {

try {
if (await isYarnInstalled()) {
await execa.shell('yarnpkg install', { stdio: `ignore` })
await execa('yarnpkg install', { stdio: `ignore` })
} else {
await execa.shell('npm install', { stdio: `ignore` })
await execa('npm install', { stdio: `ignore` })
}

spinner.succeed()
Expand All @@ -115,7 +115,7 @@ export async function installYogaStarter(path: string): Promise<void> {

async function isYarnInstalled(): Promise<boolean> {
try {
await execa.shell(`yarnpkg --version`, { stdio: `ignore` })
await execa(`yarnpkg --version`, { stdio: `ignore` })
return true
} catch (err) {
return false
Expand Down
4 changes: 2 additions & 2 deletions src/cli/commands/new/scaffold.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ This is a temporary workflow until we open up the prisma-cli API

function choicesFromGraphQLTypes(
types: GraphQLObjectType[],
): inquirer.ChoiceType[] {
const choices: inquirer.ChoiceType[] = []
): any {
const choices: any[] = []

// if (typeName === 'Query' && f === 'node')
// typeName !== Query || f !== 'node'
Expand Down
8 changes: 4 additions & 4 deletions src/cli/commands/scaffold/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import * as logger from '../../../logger'
export default async (argv: Record<string, string>) => {
const { yogaConfig, projectDir } = importYogaConfig({ env: argv.env })
const hasDb = !!yogaConfig.prisma
const inputTypeQuestion: inquirer.Question<{ inputTypeName: string }> = {
const inputTypeQuestion: inquirer.QuestionCollection<{ inputTypeName: string }> = {
name: 'inputTypeName',
message: 'Input the name of your type',
type: 'input',
Expand Down Expand Up @@ -316,7 +316,7 @@ async function runPrismaDeploy(): Promise<any> {

async function isPrismaInstalledGlobally(): Promise<boolean> {
try {
await execa.shell(`prisma --version`, { stdio: `ignore` })
await execa(`prisma --version`, { stdio: `ignore` })
return true
} catch (err) {
return false
Expand All @@ -325,7 +325,7 @@ async function isPrismaInstalledGlobally(): Promise<boolean> {

async function isPrismaInstalledLocally(): Promise<boolean> {
try {
await execa.shell(`yarn prisma --version`, { stdio: `ignore` })
await execa(`yarn prisma --version`, { stdio: `ignore` })
return true
} catch (err) {
return false
Expand All @@ -334,7 +334,7 @@ async function isPrismaInstalledLocally(): Promise<boolean> {

async function isYarnInstalled(): Promise<boolean> {
try {
await execa.shell(`yarnpkg --version`, { stdio: `ignore` })
await execa(`yarnpkg --version`, { stdio: `ignore` })
return true
} catch (err) {
return false
Expand Down

0 comments on commit bd3e466

Please sign in to comment.