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

feat(commonjs): make defaultIsModuleExports as funtion to config defaultIsModuleExports for each source #1052

Merged
merged 1 commit into from Apr 15, 2022
Merged

feat(commonjs): make defaultIsModuleExports as funtion to config defaultIsModuleExports for each source #1052

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions packages/commonjs/src/index.js
View file
Open in desktop
Expand Up @@ -47,6 +47,7 @@ export default function commonjs(options = {}) {
ignoreGlobal,
ignoreDynamicRequires,
requireReturnsDefault: requireReturnsDefaultOption,
defaultIsModuleExports: defaultIsModuleExportsOption,
esmExternals
} = options;
const getRequireReturnsDefault =
Expand All @@ -60,8 +61,11 @@ export default function commonjs(options = {}) {
: Array.isArray(esmExternals)
? ((esmExternalIds = new Set(esmExternals)), (id) => esmExternalIds.has(id))
: () => esmExternals;
const defaultIsModuleExports =
typeof options.defaultIsModuleExports === 'boolean' ? options.defaultIsModuleExports : 'auto';
const getDefaultIsModuleExports =
typeof defaultIsModuleExportsOption === 'function'
? defaultIsModuleExportsOption
: () =>
typeof defaultIsModuleExportsOption === 'boolean' ? defaultIsModuleExportsOption : 'auto';

const { dynamicRequireModuleSet, dynamicRequireModuleDirPaths } = getDynamicRequirePaths(
options.dynamicRequireTargets
Expand Down Expand Up @@ -150,7 +154,7 @@ export default function commonjs(options = {}) {
disableWrap,
commonDir,
ast,
defaultIsModuleExports
getDefaultIsModuleExports(id)
);
}

Expand Down
8 changes: 8 additions & 0 deletions packages/commonjs/types/index.d.ts
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@ import { FilterPattern } from '@rollup/pluginutils';
import { Plugin } from 'rollup';

type RequireReturnsDefaultOption = boolean | 'auto' | 'preferred' | 'namespace';
type DefaultIsModuleExportsOption = boolean | 'auto';

interface RollupCommonJSOptions {
/**
Expand Down Expand Up @@ -161,6 +162,13 @@ interface RollupCommonJSOptions {
requireReturnsDefault?:
| RequireReturnsDefaultOption
| ((id: string) => RequireReturnsDefaultOption);

/**
* @default "auto"
*/
defaultIsModuleExports?:
| DefaultIsModuleExportsOption
| ((id: string) => DefaultIsModuleExportsOption);
/**
* Some modules contain dynamic `require` calls, or require modules that
* contain circular dependencies, which are not handled well by static
Expand Down