From 93ff45328479d4e998371a82cdef3ee46ff9c91f Mon Sep 17 00:00:00 2001 From: Victor Korzunin Date: Sun, 12 Sep 2021 00:13:44 +0200 Subject: [PATCH] fix: broken .env resolving --- plop/index.ts.hbs | 6 ++---- prisma/sequelize/index.ts | 6 ++---- src/index.ts | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/plop/index.ts.hbs b/plop/index.ts.hbs index 44630c5..a291d29 100644 --- a/plop/index.ts.hbs +++ b/plop/index.ts.hbs @@ -7,11 +7,9 @@ import { findSync } from './utils'; import config from './config.json'; import * as models from './models'; -const dirname = findSync(process.cwd(), ['{{relativeOutputDir}}', '{{slsRelativeOutputDir}}'], ['d'], ['d'], 1)[0] || __dirname; - const loadedEnv = tryLoadEnvs({ - rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(dirname, config.relativeEnvPaths.rootEnvPath), - schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(dirname, config.relativeEnvPaths.schemaEnvPath), + rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(__dirname, config.relativeEnvPaths.rootEnvPath), + schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(__dirname, config.relativeEnvPaths.schemaEnvPath), }); const env = { ...(loadedEnv ? loadedEnv.parsed : {}), ...process.env }; const databaseUrl = config.datasource.url.fromEnvVar diff --git a/prisma/sequelize/index.ts b/prisma/sequelize/index.ts index d6ad23d..a291d29 100644 --- a/prisma/sequelize/index.ts +++ b/prisma/sequelize/index.ts @@ -7,11 +7,9 @@ import { findSync } from './utils'; import config from './config.json'; import * as models from './models'; -const dirname = findSync(process.cwd(), ['prisma/sequelize', 'sequelize'], ['d'], ['d'], 1)[0] || __dirname; - const loadedEnv = tryLoadEnvs({ - rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(dirname, config.relativeEnvPaths.rootEnvPath), - schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(dirname, config.relativeEnvPaths.schemaEnvPath), + rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(__dirname, config.relativeEnvPaths.rootEnvPath), + schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(__dirname, config.relativeEnvPaths.schemaEnvPath), }); const env = { ...(loadedEnv ? loadedEnv.parsed : {}), ...process.env }; const databaseUrl = config.datasource.url.fromEnvVar diff --git a/src/index.ts b/src/index.ts index e703eba..4b0d900 100644 --- a/src/index.ts +++ b/src/index.ts @@ -49,8 +49,8 @@ generatorHandler({ // datasourceNames: options.datasources.map((d) => d.name), datasource: options.datasources[0], }; - const relativeOutputDir = path.relative(process.cwd(), outputDir); - const slsRelativeOutputDir = path.relative(process.cwd(), outputDir).split(path.sep).slice(1).join(path.sep); + // const relativeOutputDir = path.relative(process.cwd(), outputDir); + // const slsRelativeOutputDir = path.relative(process.cwd(), outputDir).split(path.sep).slice(1).join(path.sep); const enumIndex = indexBy(prop('name'), options.dmmf.datamodel.enums ?? []); @@ -59,8 +59,6 @@ generatorHandler({ indexGenerator.runActions({ models: options.dmmf.datamodel.models, config: JSON.stringify(config, null, 2), - relativeOutputDir, - slsRelativeOutputDir, }), ...options.dmmf.datamodel.models.map((model) => { const attributes = model.fields.map((field) => field.name);