fix: broken .env resolving

floydspace · Sep 11, 2021 · 93ff453 · 93ff453
1 parent bf2d03b
commit 93ff453
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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);