Merge pull request #316 from graphql-boilerplates/prisma-1.7

Prisma 1.7

Author: timsuchanek

advanced/.install/index.js

@@ -4,39 +4,34 @@ const {
   deploy,
   writeEnv,
   getInfo,
+  makeSandboxEndpoint,
 } = require('graphql-boilerplate-install')
 
 module.exports = async ({ project, projectDir }) => {
   const templateName = 'graphql-boilerplate'
 
+  const endpoint = await makeSandboxEndpoint(project)
+
+  process.chdir('server/')
   replaceInFiles(
     ['src/index.js', 'package.json', 'database/prisma.yml'],
     templateName,
     project,
   )
+  replaceInFiles(['.env'], '__PRISMA_ENDPOINT__', endpoint)
 
   console.log('Running $ prisma deploy...')
   await deploy(false)
+  process.chdir('../')
 
-  const info = await getInfo()
-  const cluster = info.workspace
-    ? `${info.workspace}/${info.cluster}`
-    : info.cluster
-
-  replaceInFiles(['.env'], '__PRISMA_ENDPOINT__', info.httpEndpoint)
-
-  replaceInFiles(['.env'], `__PRISMA_CLUSTER__`, cluster)
-  replaceInFiles(
-    ['database/prisma.yml'],
-    `cluster: ${cluster}`,
-    'cluster: ${env:PRISMA_CLUSTER}',
-  )
-
-  fs.appendFileSync('.gitignore', '.env*\n')
+  fs.appendFileSync('server/.gitignore', '.env*\n')
 
   console.log(`\
 Next steps:
-  1. Change directory: \`cd ${projectDir}\`
-  2. Start local server and open Playground: \`yarn dev\`
+  1. Change directory: \`cd ${projectDir}/server\`
+  2. Start local server: \`yarn start\` (you can now open a Playground at http://localhost:4000)
+  3. Change directory: \`cd ..\`
+  4. Start React app: \`yarn start\`
+  5. Open browser: http://localhost:3000
 `)
 }

advanced/server/.env

@@ -1,5 +1,3 @@
-PRISMA_STAGE="dev"
 PRISMA_ENDPOINT="__PRISMA_ENDPOINT__"
-PRISMA_CLUSTER="__PRISMA_CLUSTER__"
 PRISMA_SECRET="mysecret123"
 APP_SECRET="jwtsecret123"

advanced/server/database/prisma.yml

@@ -1,8 +1,5 @@
-# the name for the service (will be part of the service's HTTP endpoint)
-service: graphql-boilerplate
-
-# the cluster and stage the service is deployed to
-stage: ${env:PRISMA_STAGE}
+# the endpoint of your service (this also defines the cluster the service will be deployed to)
+endpoint: ${env:PRISMA_ENDPOINT}
 
 # to disable authentication:
 # disableAuth: true

advanced/server/package.json

@@ -17,6 +17,6 @@
     "graphql-cli": "2.15.9",
     "nodemon": "1.17.3",
     "npm-run-all": "4.1.2",
-    "prisma": "1.4.0"
+    "prisma": "1.7.0"
   }
 }