Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX support either NO_COLOR or FORCE_COLOR=0 to turn off color #3272

Merged
merged 3 commits into from Dec 7, 2019
Merged

FIX support either NO_COLOR or FORCE_COLOR=0 to turn off color #3272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6602406
FIX support either NO_COLOR or FORCE_COLOR=0 to turn off color
kikonen Dec 5, 2019
a96c498
Deactivate colors in CLI tests, test NO_COLOR option
lukastaegert Dec 7, 2019
5194ed1
Merge branch 'master' into no_color
lukastaegert Dec 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions cli/logging.ts
View file
Open in desktop
Expand Up @@ -2,6 +2,12 @@ import tc from 'turbocolor';
import { RollupError } from '../src/rollup/types';
import relativeId from '../src/utils/relativeId';

// @see https://no-color.org
// @see https://www.npmjs.com/package/chalk
if (process.env.FORCE_COLOR === '0' || process.env.NO_COLOR) {
tc.enabled = false;
}

// log to stderr to keep `rollup main.js > bundle.js` from breaking
export const stderr = console.error.bind(console);

Expand Down
151 changes: 79 additions & 72 deletions test/cli/index.js
View file
Open in desktop
Expand Up @@ -26,92 +26,99 @@ runTestSuiteWithSamples(
const command =
'node ' + path.resolve(__dirname, '../../dist/bin') + path.sep + config.command;

const childProcess = exec(command, { timeout: 40000 }, (err, code, stderr) => {
if (err && !err.killed) {
if (config.error) {
const shouldContinue = config.error(err);
const childProcess = exec(
command,
{ timeout: 40000, env: Object.assign({ FORCE_COLOR: '0' }, process.env, config.env) },
(err, code, stderr) => {
if (err && !err.killed) {
if (config.error) {
const shouldContinue = config.error(err);
if (!shouldContinue) return done();
} else {
throw err;
}
}

if ('stderr' in config) {
const shouldContinue = config.stderr(stderr.trim());
if (!shouldContinue) return done();
} else {
throw err;
} else if (stderr) {
console.error(stderr);
}
}

if ('stderr' in config) {
const shouldContinue = config.stderr(stderr.trim());
if (!shouldContinue) return done();
} else if (stderr) {
console.error(stderr);
}
let unintendedError;

let unintendedError;
if (config.execute) {
try {
if (config.buble) {
code = buble.transform(code, {
transforms: { modules: false }
}).code;
}

if (config.execute) {
try {
if (config.buble) {
code = buble.transform(code, {
transforms: { modules: false }
}).code;
}
const fn = new Function('require', 'module', 'exports', 'assert', code);
const module = {
exports: {}
};
fn(require, module, module.exports, assert);

const fn = new Function('require', 'module', 'exports', 'assert', code);
const module = {
exports: {}
};
fn(require, module, module.exports, assert);
if (config.error) {
unintendedError = new Error('Expected an error while executing output');
}

if (config.error) {
unintendedError = new Error('Expected an error while executing output');
if (config.exports) {
config.exports(module.exports);
}
} catch (err) {
if (config.error) {
config.error(err);
} else {
unintendedError = err;
}
}

if (config.exports) {
config.exports(module.exports);
}
} catch (err) {
if (config.error) {
config.error(err);
} else {
unintendedError = err;
if (config.show || unintendedError) {
console.log(code + '\n\n\n');
}
}

if (config.show || unintendedError) {
console.log(code + '\n\n\n');
}

if (config.solo) console.groupEnd();
if (config.solo) console.groupEnd();

unintendedError ? done(unintendedError) : done();
} else if (config.result) {
try {
config.result(code);
done();
} catch (err) {
done(err);
}
} else if (config.test) {
try {
config.test();
done();
} catch (err) {
done(err);
}
} else if (sander.existsSync('_expected') && sander.statSync('_expected').isDirectory()) {
try {
assertDirectoriesAreEqual('_actual', '_expected');
done();
} catch (err) {
done(err);
}
} else {
const expected = sander.readFileSync('_expected.js').toString();
try {
assert.equal(normaliseOutput(code), normaliseOutput(expected));
done();
} catch (err) {
done(err);
unintendedError ? done(unintendedError) : done();
} else if (config.result) {
try {
config.result(code);
done();
} catch (err) {
done(err);
}
} else if (config.test) {
try {
config.test();
done();
} catch (err) {
done(err);
}
} else if (
sander.existsSync('_expected') &&
sander.statSync('_expected').isDirectory()
) {
try {
assertDirectoriesAreEqual('_actual', '_expected');
done();
} catch (err) {
done(err);
}
} else {
const expected = sander.readFileSync('_expected.js').toString();
try {
assert.equal(normaliseOutput(code), normaliseOutput(expected));
done();
} catch (err) {
done(err);
}
}
}
});
);

childProcess.stderr.on('data', data => {
if (config.abortOnStderr && config.abortOnStderr(data)) {
Expand Down
15 changes: 3 additions & 12 deletions test/cli/samples/code-splitting-named-default-inputs/_config.js
View file
Open in desktop
@@ -1,29 +1,20 @@
const assert = require('assert');

const COLOR = '\u001b[36m\u001b[1m';
const STANDARD = '\u001b[22m\u001b[39m';

module.exports = {
description: 'allows defining names via CLI',
command:
'rollup entry1=main1.js "Entry 2"="main 2.js" "main3.js" --entryFileNames [name]-[hash].js -f es',
result(code) {
let color = '';
let standard = '';
if (code[1] === '\u001b') {
color = COLOR;
standard = STANDARD;
}
assert.equal(
code,
'\n' +
`${color}//→ entry1-b70571c1.js:${standard}\n` +
`//→ entry1-b70571c1.js:\n` +
"console.log('main1');\n" +
'\n' +
`${color}//→ Entry 2-cc781491.js:${standard}\n` +
`//→ Entry 2-cc781491.js:\n` +
"console.log('main2');\n" +
'\n' +
`${color}//→ main3-5e259623.js:${standard}\n` +
`//→ main3-5e259623.js:\n` +
"console.log('main3');\n"
);
}
Expand Down
15 changes: 3 additions & 12 deletions test/cli/samples/code-splitting-named-inputs/_config.js
View file
Open in desktop
@@ -1,29 +1,20 @@
const assert = require('assert');

const COLOR = '\u001b[36m\u001b[1m';
const STANDARD = '\u001b[22m\u001b[39m';

module.exports = {
description: 'allows defining names via CLI',
command:
'rollup --entryFileNames [name]-[hash].js --input entry1=main1.js -i "Entry 2"="main 2.js" -i "main3.js" -f es',
result(code) {
let color = '';
let standard = '';
if (code[1] === '\u001b') {
color = COLOR;
standard = STANDARD;
}
assert.equal(
code,
'\n' +
`${color}//→ entry1-b70571c1.js:${standard}\n` +
`//→ entry1-b70571c1.js:\n` +
"console.log('main1');\n" +
'\n' +
`${color}//→ Entry 2-cc781491.js:${standard}\n` +
`//→ Entry 2-cc781491.js:\n` +
"console.log('main2');\n" +
'\n' +
`${color}//→ main3-5e259623.js:${standard}\n` +
`//→ main3-5e259623.js:\n` +
"console.log('main3');\n"
);
}
Expand Down
18 changes: 18 additions & 0 deletions test/cli/samples/no-color/_config.js
View file
Open in desktop
@@ -0,0 +1,18 @@
const assert = require('assert');

module.exports = {
description: 'respects the NO_COLOR environment variable',
command: 'rollup -i main1.js -i main2.js -f es',
env: { FORCE_COLOR: undefined, NO_COLOR: true },
result(code) {
assert.equal(
code,
'\n' +
'//→ main1.js:\n' +
"console.log('main1');\n" +
'\n' +
'//→ main2.js:\n' +
"console.log('main2');\n"
);
}
};
1 change: 1 addition & 0 deletions test/cli/samples/no-color/main1.js
View file
Open in desktop
@@ -0,0 +1 @@
console.log('main1');
1 change: 1 addition & 0 deletions test/cli/samples/no-color/main2.js
View file
Open in desktop
@@ -0,0 +1 @@
console.log('main2');
11 changes: 3 additions & 8 deletions test/cli/samples/stdout-code-splitting/_config.js
View file
Open in desktop
Expand Up @@ -6,20 +6,15 @@ const STANDARD = '\u001b[22m\u001b[39m';
module.exports = {
description: 'bundles multiple files to stdout while adding file names',
command: 'rollup -i main1.js -i main2.js -f es',
env: { FORCE_COLOR: '1' },
result(code) {
let color = '';
let standard = '';
if (code[1] === '\u001b') {
color = COLOR;
standard = STANDARD;
}
assert.equal(
code,
'\n' +
`${color}//→ main1.js:${standard}\n` +
`${COLOR}//→ main1.js:${STANDARD}\n` +
"console.log('main1');\n" +
'\n' +
`${color}//→ main2.js:${standard}\n` +
`${COLOR}//→ main2.js:${STANDARD}\n` +
"console.log('main2');" +
'\n'
);
Expand Down
5 changes: 3 additions & 2 deletions test/cli/samples/warn-circular/_config.js
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ const { assertStderrIncludes } = require('../../../utils.js');
module.exports = {
description: 'warns for circular dependencies',
command: 'rollup -c',
stderr: stderr =>
assertStderrIncludes(stderr, '(!) Circular dependency\n' + 'main.js -> dep.js -> main.js\n')
stderr(stderr) {
assertStderrIncludes(stderr, '(!) Circular dependency\nmain.js -> dep.js -> main.js\n');
}
};
16 changes: 10 additions & 6 deletions test/utils.js
View file
Open in desktop
Expand Up @@ -227,10 +227,14 @@ function assertFilesAreEqual(actualFiles, expectedFiles, dirs = []) {
}

function assertStderrIncludes(stderr, expected) {
// eslint-disable-next-line no-control-regex
const output = stderr.replace(/\x1b\[[^m]*m/g, '');
assert.ok(
output.includes(expected),
`Could not find ${JSON.stringify(expected)} in ${JSON.stringify(output)}`
);
try {
assert.ok(
stderr.includes(expected),
`Could not find ${JSON.stringify(expected)} in ${JSON.stringify(stderr)}`
);
} catch (err) {
err.actual = stderr;
err.expected = expected;
throw err;
}
}