Skip to content

Commit 44db6c3

Browse files
mjeanroymjeanroy
committed
chore: use named exports
1 parent 7e7f0fa commit 44db6c3

10 files changed

+75
-59
lines changed

‎src/index-rollup-legacy.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,25 @@
2424

2525
import hasIn from 'lodash.hasin';
2626
import isNil from 'lodash.isnil';
27-
import RollupPluginEsFormatter from './rollup-plugin-esformatter.js';
27+
import {RollupPluginEsFormatter} from './rollup-plugin-esformatter.js';
2828

29-
export default (options) => {
29+
/**
30+
* Check if `sourcemap` option is enable or not.
31+
*
32+
* @param {Object} opts Options.
33+
* @return {boolean} `true` if sourcemap is enabled, `false` otherwise.
34+
*/
35+
function isSourceMapEnabled(opts) {
36+
return !!(opts.sourcemap || opts.sourceMap);
37+
}
38+
39+
/**
40+
* Create plugin compatible with rollup < 1.0.0
41+
*
42+
* @param {*} options Plugin options.
43+
* @return {Objects} The plugin instance.
44+
*/
45+
export function rollupPluginLegacy(options) {
3046
const plugin = new RollupPluginEsFormatter(options);
3147

3248
return {
@@ -74,14 +90,4 @@ export default (options) => {
7490
return plugin.reformat(source, sourcemap);
7591
},
7692
};
77-
};
78-
79-
/**
80-
* Check if `sourcemap` option is enable or not.
81-
*
82-
* @param {Object} opts Options.
83-
* @return {boolean} `true` if sourcemap is enabled, `false` otherwise.
84-
*/
85-
function isSourceMapEnabled(opts) {
86-
return !!(opts.sourcemap || opts.sourceMap);
8793
}

‎src/index-rollup-stable.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,15 @@
2222
* SOFTWARE.
2323
*/
2424

25-
import RollupPluginEsFormatter from './rollup-plugin-esformatter.js';
25+
import {RollupPluginEsFormatter} from './rollup-plugin-esformatter.js';
2626

27-
export default (options) => {
27+
/**
28+
* Create plugin compatible with rollup >= 1.0.0
29+
*
30+
* @param {*} options Plugin options.
31+
* @return {Objects} The plugin instance.
32+
*/
33+
export function rollupPluginStable(options) {
2834
const plugin = new RollupPluginEsFormatter(options);
2935

3036
return {
@@ -46,4 +52,4 @@ export default (options) => {
4652
return plugin.reformat(source, outputOptions.sourcemap);
4753
},
4854
};
49-
};
55+
}

‎src/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@
2323
*/
2424

2525
import {rollup} from 'rollup';
26-
import legacy from './index-rollup-legacy.js';
27-
import stable from './index-rollup-stable.js';
26+
import {rollupPluginLegacy} from './index-rollup-legacy.js';
27+
import {rollupPluginStable} from './index-rollup-stable.js';
2828

2929
const VERSION = rollup.VERSION || '0';
3030
const MAJOR_VERSION = Number(VERSION.split('.')[0]) || 0;
3131
const IS_ROLLUP_LEGACY = MAJOR_VERSION === 0;
32-
const esformatter = IS_ROLLUP_LEGACY ? legacy : stable;
32+
const esformatter = IS_ROLLUP_LEGACY ? rollupPluginLegacy : rollupPluginStable;
33+
34+
export {
35+
esformatter,
36+
};
3337

3438
export default esformatter;

‎src/rollup-plugin-esformatter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const OPTIONS = new Set([
4141
/**
4242
* The rollup plugin for ESFormatter.
4343
*/
44-
export default class RollupPluginEsFormatter {
44+
export class RollupPluginEsFormatter {
4545
/**
4646
* Initialize plugin.
4747
*

‎test/index-rollup-legacy.spec.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,22 @@
2323
*/
2424

2525
import esformatter from 'esformatter';
26-
import verifyWarnLogsBecauseOfSourcemap from './utils/verify-warn-logs-because-of-source-map.js';
27-
import verifyWarnLogsNotTriggered from './utils/verify-warn-logs-not-triggered.js';
28-
import plugin from '../src/index-rollup-legacy.js';
26+
import {verifyWarnLogsBecauseOfSourcemap} from './utils/verify-warn-logs-because-of-source-map.js';
27+
import {verifyWarnLogsNotTriggered} from './utils/verify-warn-logs-not-triggered.js';
28+
import {rollupPluginLegacy} from '../src/index-rollup-legacy.js';
2929

3030
describe('rollup-plugin-esformatter [legacy]', () => {
3131
beforeEach(() => {
3232
spyOn(console, 'warn');
3333
});
3434

3535
it('should have a name', () => {
36-
const instance = plugin();
36+
const instance = rollupPluginLegacy();
3737
expect(instance.name).toBe('rollup-plugin-esformatter');
3838
});
3939

4040
it('should run esformatter with sourceMap (camelcase) enabled in input options', () => {
41-
const instance = plugin();
41+
const instance = rollupPluginLegacy();
4242

4343
instance.options({
4444
sourceMap: true,
@@ -63,7 +63,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
6363
},
6464
};
6565

66-
const instance = plugin(options);
66+
const instance = rollupPluginLegacy(options);
6767

6868
instance.options({
6969
sourcemap: true,
@@ -82,7 +82,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
8282
});
8383

8484
it('should run esformatter without sourcemap by default', () => {
85-
const instance = plugin();
85+
const instance = rollupPluginLegacy();
8686

8787
// Run the option.
8888
instance.options();
@@ -100,7 +100,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
100100
});
101101

102102
it('should run esformatter with sourcemap (lowercase) in output options', () => {
103-
const instance = plugin();
103+
const instance = rollupPluginLegacy();
104104

105105
// The input options may not contain `sourcemap` entry with rollup >= 0.53.
106106
instance.options({});
@@ -118,7 +118,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
118118
});
119119

120120
it('should run prettier with sourcemap (camelcase) in output options', () => {
121-
const instance = plugin();
121+
const instance = rollupPluginLegacy();
122122

123123
// The input options may not contain `sourcemap` entry with rollup >= 0.53.
124124
instance.options({});
@@ -136,7 +136,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
136136
});
137137

138138
it('should run prettier with sourcemap (lowercase) disabled in output options', () => {
139-
const instance = plugin();
139+
const instance = rollupPluginLegacy();
140140

141141
// The input options may not contain `sourcemap` entry with rollup >= 0.53.
142142
instance.options({});
@@ -160,7 +160,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
160160
},
161161
};
162162

163-
const instance = plugin(options);
163+
const instance = rollupPluginLegacy(options);
164164

165165
instance.options({
166166
output: {
@@ -187,7 +187,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
187187
},
188188
};
189189

190-
const instance = plugin(options);
190+
const instance = rollupPluginLegacy(options);
191191

192192
instance.options({
193193
output: [{
@@ -215,7 +215,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
215215
},
216216
};
217217

218-
const instance = plugin(options);
218+
const instance = rollupPluginLegacy(options);
219219

220220
const code = 'var foo=0;var test="hello world";';
221221
const outputOptions = {};
@@ -237,7 +237,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
237237
},
238238
};
239239

240-
const instance = plugin(options);
240+
const instance = rollupPluginLegacy(options);
241241

242242
const code = 'var foo=0;var test="hello world";';
243243
const outputOptions = {};
@@ -259,7 +259,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
259259
},
260260
};
261261

262-
const instance = plugin(options);
262+
const instance = rollupPluginLegacy(options);
263263

264264
const code = 'var foo=0;var test="hello world";';
265265
const outputOptions = {};
@@ -281,7 +281,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
281281
},
282282
};
283283

284-
const instance = plugin(options);
284+
const instance = rollupPluginLegacy(options);
285285

286286
const code = 'var foo = 0;\nvar test = "hello world";';
287287
const outputOptions = {};
@@ -302,7 +302,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
302302
},
303303
};
304304

305-
const instance = plugin(options);
305+
const instance = rollupPluginLegacy(options);
306306

307307
const code = 'var foo = 0;var test = "hello world";';
308308
const outputOptions = {};
@@ -320,7 +320,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
320320
sourcemap: false,
321321
};
322322

323-
const instance = plugin(options);
323+
const instance = rollupPluginLegacy(options);
324324

325325
const code = 'var foo = 0;';
326326
const outputOptions = {};
@@ -339,7 +339,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
339339

340340
spyOn(esformatter, 'format').and.callThrough();
341341

342-
const instance = plugin(options);
342+
const instance = rollupPluginLegacy(options);
343343
const code = 'var foo = 0;';
344344
const outputOptions = {};
345345
instance.transformBundle(code, outputOptions);
@@ -358,7 +358,7 @@ describe('rollup-plugin-esformatter [legacy]', () => {
358358

359359
spyOn(esformatter, 'format').and.callThrough();
360360

361-
const instance = plugin(options);
361+
const instance = rollupPluginLegacy(options);
362362
const code = 'var foo = 0;';
363363
const outputOptions = {};
364364
instance.transformBundle(code, outputOptions);

‎test/index-rollup-stable.spec.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@
2525
'use strict';
2626

2727
import esformatter from 'esformatter';
28-
import verifyWarnLogsBecauseOfSourcemap from './utils/verify-warn-logs-because-of-source-map.js';
29-
import verifyWarnLogsNotTriggered from './utils/verify-warn-logs-not-triggered.js';
30-
import plugin from '../src/index-rollup-stable.js';
28+
import {verifyWarnLogsBecauseOfSourcemap} from './utils/verify-warn-logs-because-of-source-map.js';
29+
import {verifyWarnLogsNotTriggered} from './utils/verify-warn-logs-not-triggered.js';
30+
import {rollupPluginStable} from '../src/index-rollup-stable.js';
3131

3232
describe('rollup-plugin-esformatter [stable]', () => {
3333
beforeEach(() => {
3434
spyOn(console, 'warn');
3535
});
3636

3737
it('should have a name', () => {
38-
const instance = plugin();
38+
const instance = rollupPluginStable();
3939
expect(instance.name).toBe('rollup-plugin-esformatter');
4040
});
4141

4242
it('should run esformatter without sourcemap by default', () => {
43-
const instance = plugin();
43+
const instance = rollupPluginStable();
4444

4545
const code = 'var foo=0;var test="hello world";';
4646
const chunk = {isEntry: false, imports: []};
@@ -56,7 +56,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
5656
});
5757

5858
it('should run esformatter with sourcemap in output options', () => {
59-
const instance = plugin();
59+
const instance = rollupPluginStable();
6060
const code = 'var foo=0;var test="hello world";';
6161
const chunk = {isEntry: false, imports: []};
6262
const outputOptions = {sourcemap: true};
@@ -71,7 +71,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
7171
});
7272

7373
it('should run prettier with sourcemap (lowercase) disabled in output options', () => {
74-
const instance = plugin();
74+
const instance = rollupPluginStable();
7575
const code = 'var foo=0;var test="hello world";';
7676
const chunk = {isEntry: false, imports: []};
7777
const outputOptions = {sourcemap: false};
@@ -93,7 +93,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
9393
},
9494
};
9595

96-
const instance = plugin(options);
96+
const instance = rollupPluginStable(options);
9797
const code = 'var foo=0;var test="hello world";';
9898
const chunk = {isEntry: false, imports: []};
9999
const outputOptions = {};
@@ -115,7 +115,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
115115
},
116116
};
117117

118-
const instance = plugin(options);
118+
const instance = rollupPluginStable(options);
119119

120120
const code = 'var foo=0;var test="hello world";';
121121
const chunk = {isEntry: false, imports: []};
@@ -138,7 +138,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
138138
},
139139
};
140140

141-
const instance = plugin(options);
141+
const instance = rollupPluginStable(options);
142142

143143
const code = 'var foo = 0;\nvar test = "hello world";';
144144
const chunk = {isEntry: false, imports: []};
@@ -160,7 +160,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
160160
},
161161
};
162162

163-
const instance = plugin(options);
163+
const instance = rollupPluginStable(options);
164164
const code = 'var foo = 0;var test = "hello world";';
165165
const chunk = {isEntry: false, imports: []};
166166
const outputOptions = {};
@@ -178,7 +178,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
178178
sourcemap: false,
179179
};
180180

181-
const instance = plugin(options);
181+
const instance = rollupPluginStable(options);
182182

183183
const code = 'var foo = 0;';
184184
const chunk = {isEntry: false, imports: []};
@@ -198,7 +198,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
198198

199199
spyOn(esformatter, 'format').and.callThrough();
200200

201-
const instance = plugin(options);
201+
const instance = rollupPluginStable(options);
202202
const code = 'var foo = 0;';
203203
const chunk = {isEntry: false, imports: []};
204204
const outputOptions = {};
@@ -218,7 +218,7 @@ describe('rollup-plugin-esformatter [stable]', () => {
218218

219219
spyOn(esformatter, 'format').and.callThrough();
220220

221-
const instance = plugin(options);
221+
const instance = rollupPluginStable(options);
222222
const code = 'var foo = 0;';
223223
const chunk = {isEntry: false, imports: []};
224224
const outputOptions = {};

‎test/it/it.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import path from 'path';
2727
import * as rollup from 'rollup';
2828
import tmp from 'tmp';
2929
import Q from 'q';
30-
import verifyWarnLogsBecauseOfSourcemap from '../utils/verify-warn-logs-because-of-source-map.js';
30+
import {verifyWarnLogsBecauseOfSourcemap} from '../utils/verify-warn-logs-because-of-source-map.js';
3131
import esformatter from '../../src/index.js';
3232

3333
describe('rollup-plugin-esformatter', () => {

‎test/rollup-plugin-esformatter.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
'use strict';
2626

27-
import RollupPluginEsFormatter from '../src/rollup-plugin-esformatter.js';
28-
import verifyWarnLogsBecauseOfSourcemap from './utils/verify-warn-logs-because-of-source-map.js';
29-
import verifyWarnLogsNotTriggered from './utils/verify-warn-logs-not-triggered.js';
27+
import {RollupPluginEsFormatter} from '../src/rollup-plugin-esformatter.js';
28+
import {verifyWarnLogsBecauseOfSourcemap} from './utils/verify-warn-logs-because-of-source-map.js';
29+
import {verifyWarnLogsNotTriggered} from './utils/verify-warn-logs-not-triggered.js';
3030

3131
describe('RollupPluginEsFormatter', () => {
3232
beforeEach(() => {

‎test/utils/verify-warn-logs-because-of-source-map.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @return {void}
2929
*/
30-
export default function verifyWarnLogsBecauseOfSourcemap() {
30+
export function verifyWarnLogsBecauseOfSourcemap() {
3131
expect(console.warn).toHaveBeenCalledWith(
3232
'[rollup-plugin-esformatter] Sourcemap is enabled, computing diff is required'
3333
);

0 commit comments

Comments
 (0)