Use passed in directory to read config file instead of process.cwd() (#…

…5393)

* Use passed in directory to read config file instead of process.cwd()

* Add dist

.changeset/wise-cows-heal.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Fixed reading config file to be local to the passed directory instead of `process.cwd()`

packages-next/keystone/package.json

@@ -4,6 +4,18 @@
   "license": "MIT",
   "main": "dist/keystone.cjs.js",
   "module": "dist/keystone.esm.js",
+  "files": [
+    "session",
+    "bin",
+    "artifacts",
+    "___internal-do-not-use-will-break-in-patch",
+    "migrations",
+    "next",
+    "schema",
+    "scripts",
+    "session",
+    "dist"
+  ],
   "bin": {
     "keystone-next": "bin/cli.js"
   },

packages-next/keystone/src/scripts/build/build.ts

@@ -7,7 +7,7 @@ import { createSystem } from '../../lib/createSystem';
 import { initConfig } from '../../lib/initConfig';
 import { requireSource } from '../../lib/requireSource';
 import { generateNodeModulesArtifacts, validateCommittedArtifacts } from '../../artifacts';
-import { CONFIG_PATH, getAdminPath } from '../utils';
+import { getAdminPath, getConfigPath } from '../utils';
 
 // FIXME: Duplicated from admin-ui package. Need to decide on a common home.
 async function writeAdminFile(file: AdminFileToWrite, projectAdminPath: string) {
@@ -41,7 +41,9 @@ export function serializePathForImport(path: string) {
 export const formatSource = (src: string, parser: 'babel' | 'babel-ts' = 'babel') =>
   prettier.format(src, { parser, trailingComma: 'es5', singleQuote: true });
 
-const reexportKeystoneConfig = async (projectAdminPath: string, isDisabled?: boolean) => {
+const reexportKeystoneConfig = async (cwd: string, isDisabled?: boolean) => {
+  const projectAdminPath = getAdminPath(cwd);
+  const configPath = getConfigPath(cwd);
   if (isDisabled) {
     // Nuke any existing files in our target directory
     await fs.remove(projectAdminPath);
@@ -57,7 +59,7 @@ const reexportKeystoneConfig = async (projectAdminPath: string, isDisabled?: boo
     {
       mode: 'write',
       src: `export { default as config } from ${serializePathForImport(
-        Path.relative(Path.join(projectAdminPath, 'pages', 'api'), CONFIG_PATH)
+        Path.relative(Path.join(projectAdminPath, 'pages', 'api'), configPath)
       )}
             export default function (req, res) { return res.status(500) }`,
       outputPath: Path.join('pages', 'api', '__keystone_api_build.js'),
@@ -85,7 +87,7 @@ const reexportKeystoneConfig = async (projectAdminPath: string, isDisabled?: boo
 export async function build(cwd: string) {
   console.log('✨ Building Keystone');
 
-  const config = initConfig(requireSource(CONFIG_PATH).default);
+  const config = initConfig(requireSource(getConfigPath(cwd)).default);
 
   const { keystone, graphQLSchema } = createSystem(config);
 
@@ -104,7 +106,7 @@ export async function build(cwd: string) {
   }
 
   console.log('✨ Generating Keystone config code');
-  await reexportKeystoneConfig(getAdminPath(cwd), config.ui?.isDisabled);
+  await reexportKeystoneConfig(cwd, config.ui?.isDisabled);
 
   console.log('✨ Building Admin UI');
   await buildAdminUI(getAdminPath(cwd));

packages-next/keystone/src/scripts/postinstall.ts

@@ -6,10 +6,10 @@ import {
 } from '../artifacts';
 import { requireSource } from '../lib/requireSource';
 import { initConfig } from '../lib/initConfig';
-import { CONFIG_PATH } from './utils';
+import { getConfigPath } from './utils';
 
 export async function postinstall(cwd: string, shouldFix: boolean) {
-  const config = initConfig(requireSource(CONFIG_PATH).default);
+  const config = initConfig(requireSource(getConfigPath(cwd)).default);
 
   const { keystone, graphQLSchema } = createSystem(config);
 

packages-next/keystone/src/scripts/prisma.ts

@@ -3,10 +3,10 @@ import { createSystem } from '../lib/createSystem';
 import { generateNodeModulesArtifacts, validateCommittedArtifacts } from '../artifacts';
 import { requireSource } from '../lib/requireSource';
 import { initConfig } from '../lib/initConfig';
-import { CONFIG_PATH } from './utils';
+import { getConfigPath } from './utils';
 
 export async function prisma(cwd: string, args: string[]) {
-  const config = initConfig(requireSource(CONFIG_PATH).default);
+  const config = initConfig(requireSource(getConfigPath(cwd)).default);
 
   const { keystone, graphQLSchema } = createSystem(config);
 

packages-next/keystone/src/scripts/run/dev.ts

@@ -12,7 +12,7 @@ import {
   getSchemaPaths,
   requirePrismaClient,
 } from '../../artifacts';
-import { CONFIG_PATH, getAdminPath } from '../utils';
+import { getAdminPath, getConfigPath } from '../utils';
 
 // TODO: Don't generate or start an Admin UI if it isn't configured!!
 const devLoadingHTMLFilepath = path.join(
@@ -28,7 +28,7 @@ export const dev = async (cwd: string, shouldDropDatabase: boolean) => {
   const server = express();
   let expressServer: null | ReturnType<typeof express> = null;
 
-  const config = initConfig(requireSource(CONFIG_PATH).default);
+  const config = initConfig(requireSource(getConfigPath(cwd)).default);
   const initKeystone = async () => {
     {
       const { keystone, graphQLSchema } = createSystem(config);

packages-next/keystone/src/scripts/utils.ts

@@ -1,6 +1,8 @@
 import path from 'path';
-// TODO: Read config path from process args
-export const CONFIG_PATH = path.join(process.cwd(), 'keystone');
+
+export function getConfigPath(cwd: string) {
+  return path.join(cwd, 'keystone');
+}
 
 export function getAdminPath(cwd: string) {
   return path.join(cwd, '.keystone/admin');