Skip to content

fix: always externalize ESM and CJS #5903

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

Closed
benmccann wants to merge 2 commits into from
Closed

fix: always externalize ESM and CJS #5903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4834a15
fix: always externalize ESM and CJS
benmccann Nov 30, 2021
315b1f8
fix: correct invalid test package
benmccann Nov 30, 2021
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
4 changes: 2 additions & 2 deletions packages/playground/optimize-missing-deps/missing-dep/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { name } from 'multi-entry-dep'
const { name } = require('multi-entry-dep')

export function sayName() {
module.exports.sayName = function () {
return name
}
17 changes: 3 additions & 14 deletions packages/vite/src/node/ssr/ssrExternal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import fs from 'fs'
import path from 'path'
import { tryNodeResolve, InternalResolveOptions } from '../plugins/resolve'
import {
Expand Down Expand Up @@ -133,23 +132,13 @@ function collectExternals(
const pkgPath = resolveFrom(`${id}/package.json`, root)
depsToTrace.add(path.dirname(pkgPath))
}
// has separate esm/require entry, assume require entry is cjs
// has separate esm/require entry, assume require entry is CJS
else if (esmEntry !== requireEntry) {
ssrExternals.add(id)
}
// if we're externalizing ESM and CJS should basically just always do it?
// or are there others like SystemJS / AMD that we'd need to handle?
// for now, we'll just leave this as is
// always externalize ESM and CJS
else if (/\.m?js$/.test(esmEntry)) {
if (pkg.type === 'module' || esmEntry.endsWith('.mjs')) {
ssrExternals.add(id)
continue
}
// check if the entry is cjs
const content = fs.readFileSync(esmEntry, 'utf-8')
if (/\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(/.test(content)) {
ssrExternals.add(id)
}
ssrExternals.add(id)
}
}

Expand Down