fix

prisma · Nov 20, 2019 · bbbb6ae · bbbb6ae
1 parent 34f5e82
commit bbbb6ae
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/cli/generator-helper/src/types.ts b/cli/generator-helper/src/types.ts
@@ -201,4 +201,5 @@ export type GeneratorManifest = {
   }
   requiresGenerators?: string[]
   requiresEngines?: EngineType[]
+  version?: string
 }
diff --git a/cli/introspection/package.json b/cli/introspection/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prisma/introspection",
-  "version": "0.0.120",
+  "version": "0.0.121",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",

diff --git a/cli/introspection/src/prompt/screens/Step60DownloadExample.tsx b/cli/introspection/src/prompt/screens/Step60DownloadExample.tsx
@@ -91,7 +91,11 @@ const Step60DownloadExample: React.FC = () => {
 
         await makeDir(state.outputDir)
 
-        const tarFile = await downloadRepo('prisma', 'prisma-examples', examples!.meta.branch)
+        const tarFile = await downloadRepo(
+          'prisma',
+          'prisma-examples',
+          process.env.PRISMA_EXAMPLES_BRANCH || examples!.meta.branch,
+        )
         setActiveIndex(1)
         await extractExample(tarFile, selectedExample!.path, state.outputDir)
 

diff --git a/cli/prisma2/package.json b/cli/prisma2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prisma2",
-  "version": "2.0.0-alpha.334",
+  "version": "2.0.0-alpha.335",
   "main": "build/index.js",
   "repository": "git@github.com:prisma/prisma2-cli.git",
   "author": "Tim Suchanek <suchanek@prisma.io>",

diff --git a/cli/prisma2/src/Generate.ts b/cli/prisma2/src/Generate.ts
@@ -55,6 +55,17 @@ export class Generate implements Command {
         ? chalk.dim(` to ./${path.relative(process.cwd(), generator.options!.generator.output!)}`)
         : ''
       const name = generator.manifest ? generator.manifest.prettyName : generator.options!.generator.provider
+      if (
+        generator.manifest?.version &&
+        generator.manifest?.version !== pkg.version &&
+        generator.options?.generator.provider === 'photonjs'
+      ) {
+        throw new Error(
+          `${chalk.bold(`@prisma/photon@${generator.manifest?.version}`)} is not compatible with ${chalk.bold(
+            `prisma2@${pkg.version}`,
+          )}. Their versions need to be equal.`,
+        )
+      }
       console.log(`Generating ${chalk.bold(name!)}${toStr}`)
       const before = Date.now()
       await generator.generate()