Skip to content
This repository was archived by the owner on Aug 4, 2021. It is now read-only.

Commit 1ef8623

Browse files
author
Kelly Selden
committed
update rollup and fix tests
1 parent 4fb249f commit 1ef8623

File tree

3 files changed

+39
-57
lines changed

3 files changed

+39
-57
lines changed

‎package-lock.json

+4-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"es5-ext": "^0.10.11",
88
"eslint": "^3.18.0",
99
"mocha": "^3.0.2",
10-
"rollup": "^0.41.6",
10+
"rollup": "^0.54.1",
1111
"rollup-plugin-buble": "^0.15.0",
1212
"rollup-plugin-commonjs": "^8.0.2",
1313
"string-capitalize": "^1.0.1",

‎test/test.js

+34-34
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ const fs = require( 'fs' );
99
process.chdir( __dirname );
1010

1111
function executeBundle ( bundle ) {
12-
const generated = bundle.generate({
12+
return bundle.generate({
1313
format: 'cjs'
14+
}).then( generated => {
15+
const fn = new Function ( 'module', 'exports', 'assert', generated.code );
16+
const module = { exports: {} };
17+
18+
fn( module, module.exports, assert );
19+
20+
return module;
1421
});
15-
16-
const fn = new Function ( 'module', 'exports', 'assert', generated.code );
17-
const module = { exports: {} };
18-
19-
fn( module, module.exports, assert );
20-
21-
return module;
2222
}
2323

2424
describe( 'rollup-plugin-node-resolve', function () {
2525
it( 'finds a module with jsnext:main', function () {
2626
return rollup.rollup({
27-
entry: 'samples/jsnext/main.js',
27+
input: 'samples/jsnext/main.js',
2828
plugins: [
2929
nodeResolve({ jsnext: true })
3030
]
@@ -35,7 +35,7 @@ describe( 'rollup-plugin-node-resolve', function () {
3535

3636
it( 'finds and converts a basic CommonJS module', function () {
3737
return rollup.rollup({
38-
entry: 'samples/commonjs/main.js',
38+
input: 'samples/commonjs/main.js',
3939
plugins: [
4040
nodeResolve({ main: true }),
4141
commonjs()
@@ -47,7 +47,7 @@ describe( 'rollup-plugin-node-resolve', function () {
4747

4848
it( 'handles a trailing slash', function () {
4949
return rollup.rollup({
50-
entry: 'samples/trailing-slash/main.js',
50+
input: 'samples/trailing-slash/main.js',
5151
plugins: [
5252
nodeResolve({ main: true }),
5353
commonjs()
@@ -59,7 +59,7 @@ describe( 'rollup-plugin-node-resolve', function () {
5959

6060
it( 'finds a file inside a package directory', function () {
6161
return rollup.rollup({
62-
entry: 'samples/granular/main.js',
62+
input: 'samples/granular/main.js',
6363
plugins: [
6464
nodeResolve(),
6565
buble()
@@ -71,7 +71,7 @@ describe( 'rollup-plugin-node-resolve', function () {
7171

7272
it( 'loads local directories by finding index.js within them', function () {
7373
return rollup.rollup({
74-
entry: 'samples/local-index/main.js',
74+
input: 'samples/local-index/main.js',
7575
plugins: [
7676
nodeResolve()
7777
]
@@ -82,22 +82,22 @@ describe( 'rollup-plugin-node-resolve', function () {
8282

8383
it( 'loads package directories by finding index.js within them', function () {
8484
return rollup.rollup({
85-
entry: 'samples/package-index/main.js',
85+
input: 'samples/package-index/main.js',
8686
plugins: [
8787
nodeResolve()
8888
]
8989
}).then( function ( bundle ) {
90-
const generated = bundle.generate({
90+
return bundle.generate({
9191
format: 'cjs'
9292
});
93-
93+
}).then( generated => {
9494
assert.ok( ~generated.code.indexOf( 'setPrototypeOf' ) );
9595
});
9696
});
9797

9898
it( 'disregards top-level browser field by default', function () {
9999
return rollup.rollup({
100-
entry: 'samples/browser/main.js',
100+
input: 'samples/browser/main.js',
101101
plugins: [
102102
nodeResolve({
103103
main: true,
@@ -111,7 +111,7 @@ describe( 'rollup-plugin-node-resolve', function () {
111111

112112
it( 'allows use of the top-level browser field', function () {
113113
return rollup.rollup({
114-
entry: 'samples/browser/main.js',
114+
input: 'samples/browser/main.js',
115115
plugins: [
116116
nodeResolve({
117117
main: true,
@@ -125,7 +125,7 @@ describe( 'rollup-plugin-node-resolve', function () {
125125

126126
it( 'disregards object browser field by default', function () {
127127
return rollup.rollup({
128-
entry: 'samples/browser-object/main.js',
128+
input: 'samples/browser-object/main.js',
129129
plugins: [
130130
nodeResolve({
131131
main: true,
@@ -141,7 +141,7 @@ describe( 'rollup-plugin-node-resolve', function () {
141141

142142
it( 'allows use of the object browser field', function () {
143143
return rollup.rollup({
144-
entry: 'samples/browser-object/main.js',
144+
input: 'samples/browser-object/main.js',
145145
plugins: [
146146
nodeResolve({
147147
main: true,
@@ -157,7 +157,7 @@ describe( 'rollup-plugin-node-resolve', function () {
157157

158158
it( 'supports `false` in browser field', function () {
159159
return rollup.rollup({
160-
entry: 'samples/browser-false/main.js',
160+
input: 'samples/browser-false/main.js',
161161
plugins: [
162162
nodeResolve({
163163
main: true,
@@ -169,7 +169,7 @@ describe( 'rollup-plugin-node-resolve', function () {
169169

170170
it( 'preferBuiltins: true allows preferring a builtin to a local module of the same name', () => {
171171
return rollup.rollup({
172-
entry: 'samples/prefer-builtin/main.js',
172+
input: 'samples/prefer-builtin/main.js',
173173
plugins: [
174174
nodeResolve({
175175
preferBuiltins: true
@@ -182,7 +182,7 @@ describe( 'rollup-plugin-node-resolve', function () {
182182

183183
it( 'preferBuiltins: false allows resolving a local module with the same name as a builtin module', () => {
184184
return rollup.rollup({
185-
entry: 'samples/prefer-builtin/main.js',
185+
input: 'samples/prefer-builtin/main.js',
186186
plugins: [
187187
nodeResolve({
188188
preferBuiltins: false
@@ -196,7 +196,7 @@ describe( 'rollup-plugin-node-resolve', function () {
196196
it( 'issues a warning when preferring a builtin module without having explicit configuration', () => {
197197
let warning = null;
198198
return rollup.rollup({
199-
entry: 'samples/prefer-builtin/main.js',
199+
input: 'samples/prefer-builtin/main.js',
200200
plugins: [
201201
nodeResolve({
202202
onwarn ( message ) {
@@ -219,7 +219,7 @@ describe( 'rollup-plugin-node-resolve', function () {
219219

220220
it( 'supports non-standard extensions', () => {
221221
return rollup.rollup({
222-
entry: 'samples/extensions/main.js',
222+
input: 'samples/extensions/main.js',
223223
plugins: [
224224
nodeResolve({
225225
extensions: [ '.js', '.wut' ]
@@ -236,7 +236,7 @@ describe( 'rollup-plugin-node-resolve', function () {
236236

237237
it( 'finds a module with module field', () => {
238238
return rollup.rollup({
239-
entry: 'samples/module/main.js',
239+
input: 'samples/module/main.js',
240240
plugins: [
241241
nodeResolve({ preferBuiltins: false })
242242
]
@@ -247,7 +247,7 @@ describe( 'rollup-plugin-node-resolve', function () {
247247

248248
it( 'prefers module field over jsnext:main and main', () => {
249249
return rollup.rollup({
250-
entry: 'samples/prefer-module/main.js',
250+
input: 'samples/prefer-module/main.js',
251251
plugins: [
252252
nodeResolve({ jsnext: true, preferBuiltins: false })
253253
]
@@ -261,7 +261,7 @@ describe( 'rollup-plugin-node-resolve', function () {
261261
linkDirectories();
262262

263263
return rollup.rollup({
264-
entry: 'samples/symlinked/first/index.js',
264+
input: 'samples/symlinked/first/index.js',
265265
plugins: [
266266
nodeResolve()
267267
]
@@ -301,7 +301,7 @@ describe( 'rollup-plugin-node-resolve', function () {
301301

302302
it( 'prefers jsnext:main field over main', () => {
303303
return rollup.rollup({
304-
entry: 'samples/prefer-jsnext/main.js',
304+
input: 'samples/prefer-jsnext/main.js',
305305
plugins: [
306306
nodeResolve({ jsnext: true, module: false, preferBuiltins: false })
307307
]
@@ -312,7 +312,7 @@ describe( 'rollup-plugin-node-resolve', function () {
312312

313313
it( 'supports ./ in entry filename', () => {
314314
return rollup.rollup({
315-
entry: './samples/jsnext/main.js',
315+
input: './samples/jsnext/main.js',
316316
plugins: [
317317
nodeResolve({ jsnext: true })
318318
]
@@ -337,7 +337,7 @@ describe( 'rollup-plugin-node-resolve', function () {
337337

338338
it( 'mark as external to module outside the jail', () => {
339339
return rollup.rollup({
340-
entry: 'samples/jail/main.js',
340+
input: 'samples/jail/main.js',
341341
plugins: [ nodeResolve({
342342
jail: `${__dirname}/samples/`
343343
}) ]
@@ -348,7 +348,7 @@ describe( 'rollup-plugin-node-resolve', function () {
348348

349349
it( 'bundle module defined inside the jail', () => {
350350
return rollup.rollup({
351-
entry: 'samples/jail/main.js',
351+
input: 'samples/jail/main.js',
352352
plugins: [ nodeResolve({
353353
jail: `${__dirname}/`
354354
}) ]
@@ -359,7 +359,7 @@ describe( 'rollup-plugin-node-resolve', function () {
359359

360360
it( 'allows custom options', () => {
361361
return rollup.rollup({
362-
entry: 'samples/custom-resolve-options/main.js',
362+
input: 'samples/custom-resolve-options/main.js',
363363
plugins: [ nodeResolve({
364364
customResolveOptions: {
365365
moduleDirectory: 'js_modules'
@@ -375,7 +375,7 @@ describe( 'rollup-plugin-node-resolve', function () {
375375

376376
it( 'ignores deep-import non-modules', () => {
377377
return rollup.rollup({
378-
entry: 'samples/deep-import-non-module/main.js',
378+
input: 'samples/deep-import-non-module/main.js',
379379
plugins: [ nodeResolve({
380380
modulesOnly: true
381381
}) ]

0 commit comments

Comments
 (0)