Skip to content

Commit fda4427

Browse files
authored
Print ids for unfinished moduleParsed and shouldTransformCachedModule hooks (#4409)
* Print ids for unfinished moduleParsed and shouldTransformCachedModule hooks * Fix linting * Do not swallow other errors when there are unfinished hook actions
1 parent d4471b4 commit fda4427

50 files changed

Lines changed: 236 additions & 162 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ module.exports = {
1919
'!/test/*.js',
2020
'!/test/*/*.js',
2121
'/test/node_modules/*.*',
22-
'!/test/*/samples/**/_config.js'
22+
'!/test/*/samples/**/_config.js',
23+
'!/test/*/samples/**/rollup.config.js'
2324
],
2425
overrides: [
2526
{

src/utils/hookActions.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ function formatAction([pluginName, hookName, args]: [string, string, Parameters<
2323
case 'transform':
2424
action += ` ${s(args[1])}`;
2525
break;
26+
case 'shouldTransformCachedModule':
27+
action += ` ${s((args[0] as { id: string }).id)}`;
28+
break;
29+
case 'moduleParsed':
30+
action += ` ${s((args[0] as { id: string }).id)}`;
31+
break;
2632
}
2733
return action;
2834
}
@@ -34,6 +40,6 @@ process.on('exit', () => {
3440
err += formatAction(action) + '\n';
3541
}
3642
console.error('%s', err);
37-
process.exit(1);
43+
process.exitCode = 1;
3844
}
3945
});

test/cli/samples/config-async-function/rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ export default async () => ({
33
output: {
44
format: 'cjs',
55
exports: 'auto'
6-
},
6+
}
77
});
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
var replace = require( '@rollup/plugin-replace' );
1+
var replace = require('@rollup/plugin-replace');
22

33
module.exports = {
44
input: 'main.js',
55
output: {
66
format: 'cjs'
77
},
8-
plugins: [
9-
replace( { preventAssignment: true, 'ANSWER': 42 } )
10-
]
8+
plugins: [replace({ preventAssignment: true, ANSWER: 42 })]
119
};
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const { defineConfig } = require("../../../../dist/rollup");
1+
const { defineConfig } = require('../../../../dist/rollup');
22

33
module.exports = defineConfig({
44
input: 'main.js',
55
output: {
66
format: 'cjs'
7-
},
7+
}
88
});
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
var replace = require( '@rollup/plugin-replace' );
1+
var replace = require('@rollup/plugin-replace');
22

33
module.exports = {
44
input: 'main.js',
55
output: {
66
format: 'cjs'
77
},
88
plugins: [
9-
replace( {
9+
replace({
1010
preventAssignment: true,
1111
__ENVIRONMENT__: process.env.PRODUCTION ? 'production' : 'development',
1212
__FOO__: process.env.FOO,
1313
__SECOND__: process.env.SECOND,
1414
__KEY__: process.env.KEY
15-
} )
15+
})
1616
]
1717
};
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
var replace = require( '@rollup/plugin-replace' );
1+
var replace = require('@rollup/plugin-replace');
22

33
module.exports = {
44
input: 'main.js',
55
output: {
66
format: 'cjs'
77
},
88
plugins: [
9-
replace( {
9+
replace({
1010
preventAssignment: true,
1111
__ENVIRONMENT__: process.env.PRODUCTION ? 'production' : 'development',
1212
__FOO__: process.env.FOO,
1313
__HOST__: process.env.HOST
14-
} )
14+
})
1515
]
1616
};
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import replace from '@rollup/plugin-replace';
22

3-
export const ignoresNonDefaultExports = true
3+
export const ignoresNonDefaultExports = true;
44

55
export default {
66
input: 'main.js',
77
output: {
88
format: 'cjs'
99
},
10-
plugins: [
11-
replace( { preventAssignment: true, 'ANSWER': 42 } )
12-
]
10+
plugins: [replace({ preventAssignment: true, ANSWER: 42 })]
1311
};

test/cli/samples/config-external-function/rollup.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import assert from 'assert';
22
import { resolve } from 'path';
33

4-
var config = resolve( './_config.js' );
4+
var config = resolve('./_config.js');
55

66
export default {
77
input: 'main.js',
88
output: {
99
format: 'cjs'
1010
},
11-
external: function ( id ) {
11+
external(id) {
1212
return id === config;
1313
},
1414
plugins: [
1515
{
16-
load: function ( id ) {
17-
assert.notEqual( id, config );
16+
load(id) {
17+
assert.notEqual(id, config);
1818
}
1919
}
2020
]

test/cli/samples/config-external/rollup.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import assert from 'assert';
22
import { resolve } from 'path';
33

4-
var config = resolve( './_config.js' );
4+
var config = resolve('./_config.js');
55

66
export default {
77
input: 'main.js',
88
output: {
99
format: 'cjs'
1010
},
11-
external: [ 'assert', config ],
11+
external: ['assert', config],
1212
plugins: [
1313
{
14-
load: function ( id ) {
15-
assert.notEqual( id, config );
14+
load(id) {
15+
assert.notEqual(id, config);
1616
}
1717
}
1818
]

0 commit comments

Comments
 (0)