From 75399bc045172279a5bcc7df19b31475fd0367c6 Mon Sep 17 00:00:00 2001 From: Charly POLY Date: Fri, 8 Sep 2023 18:53:22 +0200 Subject: [PATCH] fix: minor fixes on package.json checks --- packages/defer-rw-setup/src/cron/tasks.ts | 4 ++-- packages/defer-rw-setup/src/function/tasks.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/defer-rw-setup/src/cron/tasks.ts b/packages/defer-rw-setup/src/cron/tasks.ts index b393e86..462205e 100644 --- a/packages/defer-rw-setup/src/cron/tasks.ts +++ b/packages/defer-rw-setup/src/cron/tasks.ts @@ -5,7 +5,7 @@ import { getPaths, writeFile } from "@redwoodjs/cli-helpers"; import type { FunctionOptions } from "./command"; export const tasks = (options: FunctionOptions) => { - const PACKAGE_JSON_PATH = path.join(getPaths().base, "package.json"); + const PACKAGE_JSON_PATH = path.join(getPaths().api.base, "package.json"); const SRC_DEFER_PATH = path.join(getPaths().api.src, "jobs", "defer"); const SRC_DEFER_CLIENT_PATH_FILE = path.join( getPaths().api.src, @@ -30,7 +30,7 @@ export const tasks = (options: FunctionOptions) => { const pkg = JSON.parse(fs.readFileSync(PACKAGE_JSON_PATH, "utf-8")); if ( - !pkg.dependencies.includes("@defer/client") || + !(pkg.dependencies || {}).includes("@defer/client") || !fs.existsSync(SRC_DEFER_CLIENT_PATH_FILE) ) { throw new Error( diff --git a/packages/defer-rw-setup/src/function/tasks.ts b/packages/defer-rw-setup/src/function/tasks.ts index 5a145e7..2363049 100644 --- a/packages/defer-rw-setup/src/function/tasks.ts +++ b/packages/defer-rw-setup/src/function/tasks.ts @@ -5,7 +5,7 @@ import { getPaths, writeFile } from "@redwoodjs/cli-helpers"; import type { FunctionOptions } from "./command"; export const tasks = (options: FunctionOptions) => { - const PACKAGE_JSON_PATH = path.join(getPaths().base, "package.json"); + const PACKAGE_JSON_PATH = path.join(getPaths().api.base, "package.json"); const SRC_DEFER_PATH = path.join(getPaths().api.src, "jobs", "defer"); const SRC_DEFER_CLIENT_PATH_FILE = path.join( getPaths().api.src, @@ -30,7 +30,7 @@ export const tasks = (options: FunctionOptions) => { const pkg = JSON.parse(fs.readFileSync(PACKAGE_JSON_PATH, "utf-8")); if ( - !pkg.dependencies.includes("@defer/client") || + !(pkg.dependencies || {}).includes("@defer/client") || !fs.existsSync(SRC_DEFER_CLIENT_PATH_FILE) ) { throw new Error(