Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support node16 module resolution for CJS projects #33

Merged
merged 1 commit into from Nov 3, 2023
Merged

Support node16 module resolution for CJS projects #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 36 additions & 4 deletions process-dir.js
View file
Open in desktop
Expand Up @@ -129,6 +129,26 @@ async function replaceToCJS(dir, file, source) {
await fs.writeFile(join(dir, file.replace(/\.js$/, '.cjs')), cjs)
}

async function cloneTypesFile(dir, file) {
let pkgFile = join(dir, dirname(file), 'package.json')
if (!existsSync(pkgFile)) {
return
}
let pkg = JSON.parse(await fs.readFile(pkgFile))
if (pkg.types === undefined) {
return
}

if (!pkg.types.endsWith('.d.ts')) {
throw error('The types file extension must be .d.ts.')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would this be a reasonable assumption?

}

let typesFile = join(dir, dirname(file), pkg.types)
let cjsTypesFile = typesFile.substring(0, typesFile.length - 5) + '.d.cts' // explicitely marks the module as CommonJS

await fs.copyFile(typesFile, cjsTypesFile)
}

async function replacePackage(dir, file, files, envTargets) {
let pkgFile = join(dir, dirname(file), 'package.json')
let pkg = {}
Expand Down Expand Up @@ -156,7 +176,7 @@ async function replacePackage(dir, file, files, envTargets) {
pkg.exports = {}
pkg.exports['.'] = {}

for (let type of ['types', 'style', 'styl', 'sass', 'less']) {
for (let type of ['style', 'styl', 'sass', 'less']) {
if (pkg[type]) {
pkg.exports[pkg[type]] = pkg[type]
pkg.exports['.'][type] = pkg[type]
Expand All @@ -181,9 +201,20 @@ async function replacePackage(dir, file, files, envTargets) {
} else if (files.includes(i.replace(/\.js$/, '.browser.js'))) {
pkg.exports[path].browser = path + '/index.browser.js'
}
pkg.exports[path].require = path + '/index.cjs'
pkg.exports[path].import = path + '/index.js'
pkg.exports[path].default = path + '/index.js'

let cjsPath = path + '/index.cjs'
let esmPath = path + '/index.js'

if (pkg.types !== undefined && pkg.types.endsWith('.d.ts')) {
pkg.exports[path].require = { types: `${pkg.types.substring(0, pkg.types.length - 5)}.d.cts`, 'default': cjsPath }
pkg.exports[path].import = { types: pkg.types, 'default': esmPath }
pkg.exports[path].default = esmPath
continue
}

pkg.exports[path].require = cjsPath
pkg.exports[path].import = esmPath
pkg.exports[path].default = esmPath
}

if (Object.keys(pkg.browser).length === 0) delete pkg.browser
Expand Down Expand Up @@ -312,6 +343,7 @@ async function process(dir) {
await replaceEnvConditions(dir, file, modifiedSource)
}
})(),
cloneTypesFile(dir, file),
replacePackage(dir, file, files, envTargets)
])
}
Expand Down