Skip to content
This repository has been archived by the owner on May 22, 2024. It is now read-only.

fix: use safe version of getPackageJson when transpiling ESM #1008

Merged
merged 2 commits into from
Feb 8, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/runtimes/node/bundlers/esbuild/special_cases.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
import { getPackageJson, PackageJson } from '../../utils/package_json'
import { getPackageJsonIfAvailable, PackageJson } from '../../utils/package_json'

const EXTERNAL_MODULES = ['@prisma/client']
const IGNORED_MODULES = ['aws-sdk']

const getPackageJsonIfAvailable = async (srcDir: string): Promise<PackageJson> => {
try {
const packageJson = await getPackageJson(srcDir)

return packageJson
} catch {
return {}
}
}

const getModulesForNextJs = ({ dependencies, devDependencies }: PackageJson) => {
const allDependencies = { ...dependencies, ...devDependencies }
const externalModules = allDependencies.next ? ['critters', 'nanoid'] : []
Expand Down
4 changes: 2 additions & 2 deletions src/runtimes/node/bundlers/nft/es_modules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { FeatureFlags } from '../../../../feature_flags'
import { cachedReadFile, FsCache } from '../../../../utils/fs'
import { ModuleFormat } from '../../utils/module_format'
import { getNodeSupportMatrix } from '../../utils/node_version'
import { getPackageJson, PackageJson } from '../../utils/package_json'
import { getPackageJsonIfAvailable, PackageJson } from '../../utils/package_json'

import { transpile } from './transpile'

Expand Down Expand Up @@ -73,7 +73,7 @@ const processESM = async ({
}
}

const packageJson = await getPackageJson(dirname(mainFile))
const packageJson = await getPackageJsonIfAvailable(dirname(mainFile))
const nodeSupport = getNodeSupportMatrix(config.nodeVersion)

if (featureFlags.zisi_pure_esm && packageJson.type === 'module' && nodeSupport.esm) {
Expand Down
12 changes: 11 additions & 1 deletion src/runtimes/node/utils/package_json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,14 @@ const getPackageJson = async function (srcDir: string): Promise<PackageJson> {
}
}

export { getPackageJson, PackageJson, sanitisePackageJson }
const getPackageJsonIfAvailable = async (srcDir: string): Promise<PackageJson> => {
try {
const packageJson = await getPackageJson(srcDir)

return packageJson
} catch {
return {}
}
}

export { getPackageJson, getPackageJsonIfAvailable, PackageJson, sanitisePackageJson }