11import { extname , resolve } from 'path' ;
22import { sync as nodeResolveSync } from 'resolve' ;
33import { createFilter } from 'rollup-pluginutils' ;
4- import { EXTERNAL_PREFIX , HELPERS , HELPERS_ID , PROXY_PREFIX } from './helpers.js' ;
4+ import { peerDependencies } from '../package.json' ;
5+ import { EXTERNAL_SUFFIX , getIdFromExternalProxyId , getIdFromProxyId , HELPERS , HELPERS_ID , PROXY_SUFFIX } from './helpers' ;
56import { getIsCjsPromise , setIsCjsPromise } from './is-cjs' ;
67import { getResolveId } from './resolve-id' ;
78import { checkEsModule , hasCjsKeywords , transformCommonjs } from './transform.js' ;
@@ -27,8 +28,8 @@ export default function commonjs(options = {}) {
2728 } ) ;
2829 }
2930
30- const esModulesWithoutDefaultExport = Object . create ( null ) ;
31- const esModulesWithDefaultExport = Object . create ( null ) ;
31+ const esModulesWithoutDefaultExport = new Set ( ) ;
32+ const esModulesWithDefaultExport = new Set ( ) ;
3233 const allowDynamicRequire = ! ! options . ignore ; // TODO maybe this should be configurable?
3334
3435 const ignoreRequire =
@@ -38,24 +39,59 @@ export default function commonjs(options = {}) {
3839 ? id => options . ignore . includes ( id )
3940 : ( ) => false ;
4041
41- let entryModuleIdsPromise = null ;
42-
4342 const resolveId = getResolveId ( extensions ) ;
4443
4544 const sourceMap = options . sourceMap !== false ;
4645
46+ function transformAndCheckExports ( code , id ) {
47+ {
48+ const { isEsModule, hasDefaultExport, ast } = checkEsModule ( this . parse , code , id ) ;
49+ if ( isEsModule ) {
50+ ( hasDefaultExport ? esModulesWithDefaultExport : esModulesWithoutDefaultExport ) . add ( id ) ;
51+ return null ;
52+ }
53+
54+ // it is not an ES module but it does not have CJS-specific elements.
55+ if ( ! hasCjsKeywords ( code , ignoreGlobal ) ) {
56+ esModulesWithoutDefaultExport . add ( id ) ;
57+ return null ;
58+ }
59+
60+ const transformed = transformCommonjs (
61+ this . parse ,
62+ code ,
63+ id ,
64+ this . getModuleInfo ( id ) . isEntry ,
65+ ignoreGlobal ,
66+ ignoreRequire ,
67+ customNamedExports [ id ] ,
68+ sourceMap ,
69+ allowDynamicRequire ,
70+ ast
71+ ) ;
72+ if ( ! transformed ) {
73+ esModulesWithoutDefaultExport . add ( id ) ;
74+ return null ;
75+ }
76+
77+ return transformed ;
78+ }
79+ }
80+
4781 return {
4882 name : 'commonjs' ,
4983
50- options ( options ) {
51- resolveId . setRollupOptions ( options ) ;
52- const input = options . input || options . entry ;
53- const entryModules = Array . isArray ( input )
54- ? input
55- : typeof input === 'object' && input !== null
56- ? Object . values ( input )
57- : [ input ] ;
58- entryModuleIdsPromise = Promise . all ( entryModules . map ( entry => resolveId ( entry ) ) ) ;
84+ buildStart ( ) {
85+ const [ major , minor ] = this . meta . rollupVersion . split ( '.' ) . map ( Number ) ;
86+ const minVersion = peerDependencies . rollup . slice ( 2 ) ;
87+ const [ minMajor , minMinor ] = minVersion . split ( '.' ) . map ( Number ) ;
88+ if ( major < minMajor || ( major === minMajor && minor < minMinor ) ) {
89+ this . error (
90+ `Insufficient Rollup version: "rollup-plugin-commonjs" requires at least rollup@${ minVersion } ${
91+ this . meta . rollupVersion
92+ } .`
93+ ) ;
94+ }
5995 } ,
6096
6197 resolveId,
@@ -64,25 +100,25 @@ export default function commonjs(options = {}) {
64100 if ( id === HELPERS_ID ) return HELPERS ;
65101
66102 // generate proxy modules
67- if ( id . startsWith ( EXTERNAL_PREFIX ) ) {
68- const actualId = id . slice ( EXTERNAL_PREFIX . length ) ;
103+ if ( id . endsWith ( EXTERNAL_SUFFIX ) ) {
104+ const actualId = getIdFromExternalProxyId ( id ) ;
69105 const name = getName ( actualId ) ;
70106
71107 return `import ${ name } ${ JSON . stringify ( actualId ) } ${ name } ;
72108 }
73109
74- if ( id . startsWith ( PROXY_PREFIX ) ) {
75- const actualId = id . slice ( PROXY_PREFIX . length ) ;
110+ if ( id . endsWith ( PROXY_SUFFIX ) ) {
111+ const actualId = getIdFromProxyId ( id ) ;
76112 const name = getName ( actualId ) ;
77113
78114 return getIsCjsPromise ( actualId ) . then ( isCjs => {
79115 if ( isCjs )
80116 return `import { __moduleExports } from ${ JSON . stringify (
81117 actualId
82118 ) } ; export default __moduleExports;`;
83- else if ( esModulesWithoutDefaultExport [ actualId ] )
119+ else if ( esModulesWithoutDefaultExport . has ( actualId ) )
84120 return `import * as ${ name } ${ JSON . stringify ( actualId ) } ${ name } ;
85- else if ( esModulesWithDefaultExport [ actualId ] ) {
121+ else if ( esModulesWithDefaultExport . has ( actualId ) ) {
86122 return `export {default} from ${ JSON . stringify ( actualId ) } ;
87123 } else
88124 return `import * as ${ name } ${ JSON . stringify (
@@ -94,51 +130,20 @@ export default function commonjs(options = {}) {
94130
95131 transform ( code , id ) {
96132 if ( ! filter ( id ) || extensions . indexOf ( extname ( id ) ) === - 1 ) {
97- setIsCjsPromise ( id , Promise . resolve ( null ) ) ;
133+ setIsCjsPromise ( id , null ) ;
98134 return null ;
99135 }
100136
101- const transformPromise = entryModuleIdsPromise
102- . then ( entryModuleIds => {
103- const { isEsModule, hasDefaultExport, ast } = checkEsModule ( this . parse , code , id ) ;
104- if ( isEsModule ) {
105- ( hasDefaultExport ? esModulesWithDefaultExport : esModulesWithoutDefaultExport ) [
106- id
107- ] = true ;
108- return null ;
109- }
110-
111- // it is not an ES module but it does not have CJS-specific elements.
112- if ( ! hasCjsKeywords ( code , ignoreGlobal ) ) {
113- esModulesWithoutDefaultExport [ id ] = true ;
114- return null ;
115- }
116-
117- const transformed = transformCommonjs (
118- this . parse ,
119- code ,
120- id ,
121- entryModuleIds . indexOf ( id ) !== - 1 ,
122- ignoreGlobal ,
123- ignoreRequire ,
124- customNamedExports [ id ] ,
125- sourceMap ,
126- allowDynamicRequire ,
127- ast
128- ) ;
129- if ( ! transformed ) {
130- esModulesWithoutDefaultExport [ id ] = true ;
131- return null ;
132- }
133-
134- return transformed ;
135- } )
136- . catch ( err => {
137- this . error ( err , err . loc ) ;
138- } ) ;
137+ let transformed ;
138+ try {
139+ transformed = transformAndCheckExports . call ( this , code , id ) ;
140+ } catch ( err ) {
141+ transformed = null ;
142+ this . error ( err , err . loc ) ;
143+ }
139144
140- setIsCjsPromise ( id , transformPromise . then ( Boolean , ( ) => false ) ) ;
141- return transformPromise ;
145+ setIsCjsPromise ( id , Boolean ( transformed ) ) ;
146+ return transformed ;
142147 }
143148 } ;
144149}
0 commit comments