Skip to content

Commit

Permalink
Print ids for unfinished moduleParsed and shouldTransformCachedModule…
Browse files Browse the repository at this point in the history
… hooks (#4409)

* Print ids for unfinished moduleParsed and shouldTransformCachedModule hooks

* Fix linting

* Do not swallow other errors when there are unfinished hook actions
  • Loading branch information
lukastaegert committed Feb 18, 2022
1 parent d4471b4 commit fda4427
Show file tree
Hide file tree
Showing 50 changed files with 236 additions and 162 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Expand Up @@ -19,7 +19,8 @@ module.exports = {
'!/test/*.js',
'!/test/*/*.js',
'/test/node_modules/*.*',
'!/test/*/samples/**/_config.js'
'!/test/*/samples/**/_config.js',
'!/test/*/samples/**/rollup.config.js'
],
overrides: [
{
Expand Down
8 changes: 7 additions & 1 deletion src/utils/hookActions.ts
Expand Up @@ -23,6 +23,12 @@ function formatAction([pluginName, hookName, args]: [string, string, Parameters<
case 'transform':
action += ` ${s(args[1])}`;
break;
case 'shouldTransformCachedModule':
action += ` ${s((args[0] as { id: string }).id)}`;
break;
case 'moduleParsed':
action += ` ${s((args[0] as { id: string }).id)}`;
break;
}
return action;
}
Expand All @@ -34,6 +40,6 @@ process.on('exit', () => {
err += formatAction(action) + '\n';
}
console.error('%s', err);
process.exit(1);
process.exitCode = 1;
}
});
2 changes: 1 addition & 1 deletion test/cli/samples/config-async-function/rollup.config.js
Expand Up @@ -3,5 +3,5 @@ export default async () => ({
output: {
format: 'cjs',
exports: 'auto'
},
}
});
6 changes: 2 additions & 4 deletions test/cli/samples/config-cwd-case-insensitive/rollup.config.js
@@ -1,11 +1,9 @@
var replace = require( '@rollup/plugin-replace' );
var replace = require('@rollup/plugin-replace');

module.exports = {
input: 'main.js',
output: {
format: 'cjs'
},
plugins: [
replace( { preventAssignment: true, 'ANSWER': 42 } )
]
plugins: [replace({ preventAssignment: true, ANSWER: 42 })]
};
4 changes: 2 additions & 2 deletions test/cli/samples/config-defineConfig-cjs/rollup.config.js
@@ -1,8 +1,8 @@
const { defineConfig } = require("../../../../dist/rollup");
const { defineConfig } = require('../../../../dist/rollup');

module.exports = defineConfig({
input: 'main.js',
output: {
format: 'cjs'
},
}
});
6 changes: 3 additions & 3 deletions test/cli/samples/config-env-multiple/rollup.config.js
@@ -1,17 +1,17 @@
var replace = require( '@rollup/plugin-replace' );
var replace = require('@rollup/plugin-replace');

module.exports = {
input: 'main.js',
output: {
format: 'cjs'
},
plugins: [
replace( {
replace({
preventAssignment: true,
__ENVIRONMENT__: process.env.PRODUCTION ? 'production' : 'development',
__FOO__: process.env.FOO,
__SECOND__: process.env.SECOND,
__KEY__: process.env.KEY
} )
})
]
};
6 changes: 3 additions & 3 deletions test/cli/samples/config-env/rollup.config.js
@@ -1,16 +1,16 @@
var replace = require( '@rollup/plugin-replace' );
var replace = require('@rollup/plugin-replace');

module.exports = {
input: 'main.js',
output: {
format: 'cjs'
},
plugins: [
replace( {
replace({
preventAssignment: true,
__ENVIRONMENT__: process.env.PRODUCTION ? 'production' : 'development',
__FOO__: process.env.FOO,
__HOST__: process.env.HOST
} )
})
]
};
6 changes: 2 additions & 4 deletions test/cli/samples/config-es6/rollup.config.js
@@ -1,13 +1,11 @@
import replace from '@rollup/plugin-replace';

export const ignoresNonDefaultExports = true
export const ignoresNonDefaultExports = true;

export default {
input: 'main.js',
output: {
format: 'cjs'
},
plugins: [
replace( { preventAssignment: true, 'ANSWER': 42 } )
]
plugins: [replace({ preventAssignment: true, ANSWER: 42 })]
};
8 changes: 4 additions & 4 deletions test/cli/samples/config-external-function/rollup.config.js
@@ -1,20 +1,20 @@
import assert from 'assert';
import { resolve } from 'path';

var config = resolve( './_config.js' );
var config = resolve('./_config.js');

export default {
input: 'main.js',
output: {
format: 'cjs'
},
external: function ( id ) {
external(id) {
return id === config;
},
plugins: [
{
load: function ( id ) {
assert.notEqual( id, config );
load(id) {
assert.notEqual(id, config);
}
}
]
Expand Down
8 changes: 4 additions & 4 deletions test/cli/samples/config-external/rollup.config.js
@@ -1,18 +1,18 @@
import assert from 'assert';
import { resolve } from 'path';

var config = resolve( './_config.js' );
var config = resolve('./_config.js');

export default {
input: 'main.js',
output: {
format: 'cjs'
},
external: [ 'assert', config ],
external: ['assert', config],
plugins: [
{
load: function ( id ) {
assert.notEqual( id, config );
load(id) {
assert.notEqual(id, config);
}
}
]
Expand Down
4 changes: 1 addition & 3 deletions test/cli/samples/config-function/rollup.config.js
Expand Up @@ -11,8 +11,6 @@ export default commandOptions => {
onwarn(warning) {
throw new Error(`Unexpected warning: ${warning.message}`);
},
plugins: [
replace( { preventAssignment: true, 'COMMAND_OPTIONS': JSON.stringify(commandOptions) } )
]
plugins: [replace({ preventAssignment: true, COMMAND_OPTIONS: JSON.stringify(commandOptions) })]
};
};
4 changes: 1 addition & 3 deletions test/cli/samples/config-json/rollup.config.js
Expand Up @@ -6,7 +6,5 @@ module.exports = {
output: {
format: 'cjs'
},
plugins: [
replace( { preventAssignment: true, '__VERSION__': pkg.version } )
]
plugins: [replace({ preventAssignment: true, __VERSION__: pkg.version })]
};
10 changes: 5 additions & 5 deletions test/cli/samples/config-multiple-getfilename/rollup.config.js
Expand Up @@ -11,21 +11,21 @@ export default {
this.emitFile({
type: 'asset',
fileName: `${options.format}.txt`,
source: this.getFileName(fileReference),
source: this.getFileName(fileReference)
});
},
}
},
output: [
{
format: 'es',
dir: '_actual',
entryFileNames: 'es-[name].js',
entryFileNames: 'es-[name].js'
},
{
format: 'cjs',
dir: '_actual',
entryFileNames: 'cjs-[name].js',
exports: 'auto'
},
],
}
]
};
Expand Up @@ -5,7 +5,7 @@ export default {
format: 'cjs',
dir: '_actual',
entryFileNames: '[name]-[format].js',
sourcemap: true,
sourcemap: true
},
{
format: 'es',
Expand Down
2 changes: 1 addition & 1 deletion test/cli/samples/config-no-output/rollup.config.js
Expand Up @@ -3,4 +3,4 @@ export default {
output: {
format: 'es'
}
};
};
4 changes: 1 addition & 3 deletions test/cli/samples/config-override/rollup.config.js
Expand Up @@ -5,7 +5,5 @@ export default {
output: {
format: 'amd'
},
plugins: [
replace( { preventAssignment: true, 'ANSWER': 42 } )
]
plugins: [replace({ preventAssignment: true, ANSWER: 42 })]
};
4 changes: 1 addition & 3 deletions test/cli/samples/config-true/rollup.config.js
Expand Up @@ -5,7 +5,5 @@ export default {
output: {
format: 'cjs'
},
plugins: [
replace( { preventAssignment: true, 'ANSWER': 42 } )
]
plugins: [replace({ preventAssignment: true, ANSWER: 42 })]
};
6 changes: 2 additions & 4 deletions test/cli/samples/config/rollup.config.js
@@ -1,11 +1,9 @@
var replace = require( '@rollup/plugin-replace' );
var replace = require('@rollup/plugin-replace');

module.exports = {
input: 'main.js',
output: {
format: 'cjs'
},
plugins: [
replace( { preventAssignment: true, 'ANSWER': 42 } )
]
plugins: [replace({ preventAssignment: true, ANSWER: 42 })]
};
4 changes: 2 additions & 2 deletions test/cli/samples/custom-frame-with-pos/rollup.config.js
Expand Up @@ -10,9 +10,9 @@ module.exports = {
err.frame = 'custom code frame';
this.error(err, {
line: 1,
column: 5,
column: 5
});
}
},
}
]
};
2 changes: 1 addition & 1 deletion test/cli/samples/custom-frame/rollup.config.js
Expand Up @@ -10,6 +10,6 @@ module.exports = {
err.frame = 'custom code frame';
this.error(err);
}
},
}
]
};
36 changes: 19 additions & 17 deletions test/cli/samples/emit-file-multiple-dirs/rollup.config.js
@@ -1,18 +1,20 @@
export default {
input: "main.js",
output: [
{
dir: "_actual/dist1",
format: "cjs"
},
{
dir: "_actual/dist2",
format: "es"
}
],
plugins: [{
generateBundle() {
this.emitFile({type: "asset", fileName: "myfile", source: "abc"})
}
}]
}
input: 'main.js',
output: [
{
dir: '_actual/dist1',
format: 'cjs'
},
{
dir: '_actual/dist2',
format: 'es'
}
],
plugins: [
{
generateBundle() {
this.emitFile({ type: 'asset', fileName: 'myfile', source: 'abc' });
}
}
]
};
Expand Up @@ -8,4 +8,4 @@ export default {
reservedNamesAsProps: false
}
}
}
};
6 changes: 2 additions & 4 deletions test/cli/samples/merge-deprecations/rollup.config.js
@@ -1,4 +1,4 @@
var replace = require( '@rollup/plugin-replace' );
var replace = require('@rollup/plugin-replace');

module.exports = {
entry: 'main.js',
Expand All @@ -9,7 +9,5 @@ module.exports = {
file: '_actual/bundle2.js',
format: 'es'
},
plugins: [
replace( { preventAssignment: true, 'ANSWER': 42 } )
]
plugins: [replace({ preventAssignment: true, ANSWER: 42 })]
};
41 changes: 23 additions & 18 deletions test/cli/samples/multiple-configs/rollup.config.js
@@ -1,20 +1,25 @@
export default [{
input: 'main.js',
output: {
file: '_actual/bundle1.js',
format: 'cjs',
exports: 'auto'
}
}, {
input: 'main.js',
plugins: [{
resolveId(id) {
throw new Error("Unexpected Exception");
export default [
{
input: 'main.js',
output: {
file: '_actual/bundle1.js',
format: 'cjs',
exports: 'auto'
}
},
{
input: 'main.js',
plugins: [
{
resolveId(id) {
throw new Error('Unexpected Exception');
}
}
],
output: {
file: '_actual/bundle2.js',
format: 'cjs',
exports: 'auto'
}
}],
output: {
file: '_actual/bundle2.js',
format: 'cjs',
exports: 'auto'
}
}];
];
2 changes: 1 addition & 1 deletion test/cli/samples/paths-output-option/rollup.config.js
Expand Up @@ -4,7 +4,7 @@ module.exports = {
output: {
format: 'cjs',
paths: {
'foo': 'bar'
foo: 'bar'
},
interop: false
}
Expand Down

0 comments on commit fda4427

Please sign in to comment.