Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/services/build/build.rust.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import type {BuildArgs} from '../../types/build';
import {readSatelliteDid} from '../../utils/did.utils';
import {checkCargoBinInstalled, checkIcWasmVersion, checkRustVersion} from '../../utils/env.utils';
import {formatBytes, formatTime} from '../../utils/format.utils';
import {readPackageJson} from '../../utils/pkg.utils';
import {confirmAndExit} from '../../utils/prompt.utils';

const CARGO_RELEASE_DIR = join(process.cwd(), 'target', 'wasm32-unknown-unknown', 'release');
Expand Down Expand Up @@ -193,9 +194,7 @@ const api = async () => {

const readCoreLib = async (): Promise<'core' | 'core-standalone'> => {
try {
const packageJson = await readFile(join(process.cwd(), 'package.json'), 'utf-8');
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
const {dependencies} = JSON.parse(packageJson) as {dependencies?: Record<string, string>};
const {dependencies} = await readPackageJson();
return Object.keys(dependencies ?? {}).includes('@junobuild/core-standalone')
? 'core-standalone'
: 'core';
Expand Down
7 changes: 3 additions & 4 deletions src/services/eject/eject.javascript.services.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {execute} from '@junobuild/cli-tools';
import {magenta} from 'kleur';
import {mkdir, readFile} from 'node:fs/promises';
import {mkdir} from 'node:fs/promises';
import {join} from 'node:path';
import {
DEVELOPER_PROJECT_SATELLITE_PATH,
Expand All @@ -10,6 +10,7 @@ import {
TS_TEMPLATE_PATH
} from '../../constants/dev.constants';
import {copyTemplateFile} from '../../utils/fs.utils';
import {readPackageJson} from '../../utils/pkg.utils';
import {detectPackageManager} from '../../utils/pm.utils';
import {confirmAndExit} from '../../utils/prompt.utils';

Expand Down Expand Up @@ -77,9 +78,7 @@ const installFunctionsLib = async () => {

const hasFunctionsLib = async (): Promise<boolean> => {
try {
const packageJson = await readFile(join(process.cwd(), 'package.json'), 'utf-8');
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
const {dependencies} = JSON.parse(packageJson) as {dependencies?: Record<string, string>};
const {dependencies} = await readPackageJson();
return Object.keys(dependencies ?? {}).includes('@junobuild/functions');
} catch (_err: unknown) {
// This should not block the developer therefore we fallback to asking for installing the library.
Expand Down
17 changes: 17 additions & 0 deletions src/utils/pkg.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import {readFile} from 'node:fs/promises';
import {join} from 'node:path';

export interface PackageJson {
dependencies?: Record<string, string>;
}

export const readPackageJson = async (): Promise<PackageJson> => {
const packageJson = await readFile(join(process.cwd(), 'package.json'), 'utf-8');

// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
const {dependencies} = JSON.parse(packageJson) as {dependencies?: Record<string, string>};

return {
dependencies
};
};