diff --git a/src/packages/client/scripts/postinstall.js b/src/packages/client/scripts/postinstall.js index 810a99bd7b61..b45dfde2291c 100644 --- a/src/packages/client/scripts/postinstall.js +++ b/src/packages/client/scripts/postinstall.js @@ -19,8 +19,8 @@ function debug(message, ...optionalParams) { * Adds `package.json` to the end of a path if it doesn't already exist' * @param {string} pth */ -function addPackageJSON(pth){ - if(pth.endsWith('package.json')) return pth +function addPackageJSON(pth) { + if (pth.endsWith('package.json')) return pth return path.join(pth, 'package.json') } @@ -28,18 +28,18 @@ function addPackageJSON(pth){ * Looks up for a `package.json` which is not `@prisma/cli` or `prisma` and returns the directory of the package * @param {string} startPath - Path to Start At * @param {number} limit - Find Up limit - * @returns {string | null} + * @returns {string | null} */ -function findPackageRoot(startPath, limit = 10){ - if(!startPath || !fs.existsSync(startPath)) return null - let currentPath = startPath +function findPackageRoot(startPath, limit = 10) { + if (!startPath || !fs.existsSync(startPath)) return null + let currentPath = startPath // Limit traversal - for(let i = 0; i < limit; i++){ + for (let i = 0; i < limit; i++) { const pkgPath = addPackageJSON(currentPath) - if(fs.existsSync(pkgPath)){ + if (fs.existsSync(pkgPath)) { try { const pkg = require(pkgPath) - if(pkg.name && !['@prisma/cli', 'prisma'].includes(pkg.name)){ + if (pkg.name && !['@prisma/cli', 'prisma'].includes(pkg.name)) { return pkgPath.replace('package.json', '') } } catch {} @@ -68,7 +68,7 @@ async function main() { const root = findPackageRoot(localPath) process.env.PRISMA_GENERATE_IN_POSTINSTALL = root ? root : 'true' - + debug({ localPath, installedGlobally, @@ -148,7 +148,7 @@ Please uninstall it with either ${c.green('npm remove -g prisma')} or ${c.green( } } -if (!process.env.SKIP_GENERATE) { +if (!process.env.PRISMA_SKIP_POSTINSTALL_GENERATE) { main() .catch((e) => { if (e.stderr) { diff --git a/src/packages/client/src/__tests__/scripts/postinstall.test.ts b/src/packages/client/src/__tests__/scripts/postinstall.test.ts index 211bb0b43a3f..20a414e2415a 100644 --- a/src/packages/client/src/__tests__/scripts/postinstall.test.ts +++ b/src/packages/client/src/__tests__/scripts/postinstall.test.ts @@ -1,5 +1,5 @@ // Prevent postinstall script from running -process.env.SKIP_GENERATE = 'true' +process.env.PRISMA_SKIP_POSTINSTALL_GENERATE = 'true' import { getPostInstallTrigger, diff --git a/src/packages/migrate/src/__tests__/DbPush.test.ts b/src/packages/migrate/src/__tests__/DbPush.test.ts index d961db900afb..30ff89488843 100644 --- a/src/packages/migrate/src/__tests__/DbPush.test.ts +++ b/src/packages/migrate/src/__tests__/DbPush.test.ts @@ -1,5 +1,5 @@ process.env.GITHUB_ACTIONS = '1' -process.env.MIGRATE_SKIP_GENERATE = '1' +process.env.PRISMA_MIGRATE_SKIP_GENERATE = '1' import prompt from 'prompts' import { DbPush } from '../commands/DbPush' diff --git a/src/packages/migrate/src/__tests__/MigrateDev.test.ts b/src/packages/migrate/src/__tests__/MigrateDev.test.ts index a41306422d4b..411b1db19435 100644 --- a/src/packages/migrate/src/__tests__/MigrateDev.test.ts +++ b/src/packages/migrate/src/__tests__/MigrateDev.test.ts @@ -13,7 +13,7 @@ import { const ctx = Context.new().add(consoleContext()).assemble() process.env.GITHUB_ACTIONS = '1' -process.env.MIGRATE_SKIP_GENERATE = '1' +process.env.PRISMA_MIGRATE_SKIP_GENERATE = '1' describe('common', () => { it('wrong flag', async () => { diff --git a/src/packages/migrate/src/__tests__/MigrateReset.test.ts b/src/packages/migrate/src/__tests__/MigrateReset.test.ts index 4f65fa8831a8..1530b6114365 100644 --- a/src/packages/migrate/src/__tests__/MigrateReset.test.ts +++ b/src/packages/migrate/src/__tests__/MigrateReset.test.ts @@ -1,4 +1,4 @@ -process.env.MIGRATE_SKIP_GENERATE = '1' +process.env.PRISMA_MIGRATE_SKIP_GENERATE = '1' process.env.GITHUB_ACTIONS = '1' import prompt from 'prompts' diff --git a/src/packages/migrate/src/commands/DbPush.ts b/src/packages/migrate/src/commands/DbPush.ts index 3448eb9a46dc..91a0b8ad230a 100644 --- a/src/packages/migrate/src/commands/DbPush.ts +++ b/src/packages/migrate/src/commands/DbPush.ts @@ -255,7 +255,7 @@ ${chalk.bold.redBright('All data will be lost.')} } // Run if not skipped - if (!process.env.MIGRATE_SKIP_GENERATE && !args['--skip-generate']) { + if (!process.env.PRISMA_MIGRATE_SKIP_GENERATE && !args['--skip-generate']) { await migrate.tryToRunGenerate() } diff --git a/src/packages/migrate/src/commands/MigrateDev.ts b/src/packages/migrate/src/commands/MigrateDev.ts index a40e2eb864a1..28fc1f728bed 100644 --- a/src/packages/migrate/src/commands/MigrateDev.ts +++ b/src/packages/migrate/src/commands/MigrateDev.ts @@ -190,7 +190,7 @@ ${chalk.bold('Examples')} // If database was reset we want to run the seed if not skipped if ( devDiagnostic.action.tag === 'reset' && - !process.env.MIGRATE_SKIP_SEED && + !process.env.PRISMA_MIGRATE_SKIP_SEED && !args['--skip-seed'] ) { // Run seed if 1 or more seed files are present @@ -293,7 +293,7 @@ ${chalk.green('Your database is now in sync with your schema.')}`, } // Run if not skipped - if (!process.env.MIGRATE_SKIP_GENERATE && !args['--skip-generate']) { + if (!process.env.PRISMA_MIGRATE_SKIP_GENERATE && !args['--skip-generate']) { await migrate.tryToRunGenerate() console.info() // empty line } diff --git a/src/packages/migrate/src/commands/MigrateReset.ts b/src/packages/migrate/src/commands/MigrateReset.ts index 383909f08c97..528300bf3d3d 100644 --- a/src/packages/migrate/src/commands/MigrateReset.ts +++ b/src/packages/migrate/src/commands/MigrateReset.ts @@ -159,12 +159,12 @@ The following migration(s) have been applied:\n\n${chalk( } // Run if not skipped - if (!process.env.MIGRATE_SKIP_GENERATE && !args['--skip-generate']) { + if (!process.env.PRISMA_MIGRATE_SKIP_GENERATE && !args['--skip-generate']) { await migrate.tryToRunGenerate() } // Run if not skipped - if (!process.env.MIGRATE_SKIP_SEED && !args['--skip-seed']) { + if (!process.env.PRISMA_MIGRATE_SKIP_SEED && !args['--skip-seed']) { // Run seed if 1 or more seed files are present const detected = detectSeedFiles(schemaPath) if (detected.numberOfSeedFiles > 0) { diff --git a/src/packages/sdk/src/predefinedGeneratorResolvers.ts b/src/packages/sdk/src/predefinedGeneratorResolvers.ts index cb72f16100d1..ba326bb0b9f4 100644 --- a/src/packages/sdk/src/predefinedGeneratorResolvers.ts +++ b/src/packages/sdk/src/predefinedGeneratorResolvers.ts @@ -126,7 +126,7 @@ async function installPackage(baseDir: string, pkg: string): Promise { cwd: baseDir, stdio: 'inherit', env: { - SKIP_GENERATE: 'true', + PRISMA_SKIP_POSTINSTALL_GENERATE: 'true', }, }) } diff --git a/src/packages/tests/src/__tests__/__helpers__/integrationTest.ts b/src/packages/tests/src/__tests__/__helpers__/integrationTest.ts index 94ef4b3432c3..a1559d8f1b14 100644 --- a/src/packages/tests/src/__tests__/__helpers__/integrationTest.ts +++ b/src/packages/tests/src/__tests__/__helpers__/integrationTest.ts @@ -9,7 +9,7 @@ import { getTestClient } from '@prisma/client/dist/utils/getTestClient' process.setMaxListeners(200) -process.env.SKIP_GENERATE = 'true' +process.env.PRISMA_SKIP_POSTINSTALL_GENERATE = 'true' const engine = new IntrospectionEngine() diff --git a/src/scripts/ci/all.ts b/src/scripts/ci/all.ts index cefc14fe6b45..1717c7822a3b 100644 --- a/src/scripts/ci/all.ts +++ b/src/scripts/ci/all.ts @@ -14,7 +14,7 @@ async function run(cwd: string, cmd: string): Promise { shell: true, env: { ...process.env, - SKIP_GENERATE: 'true', + PRISMA_SKIP_POSTINSTALL_GENERATE: 'true', }, }) } catch (e) { diff --git a/src/scripts/ci/publish.ts b/src/scripts/ci/publish.ts index ea16749e6a61..8b470d33809c 100644 --- a/src/scripts/ci/publish.ts +++ b/src/scripts/ci/publish.ts @@ -149,7 +149,7 @@ async function run( shell: true, env: { ...process.env, - SKIP_GENERATE: 'true', + PRISMA_SKIP_POSTINSTALL_GENERATE: 'true', }, }) } catch (e) {