Skip to content

improve development mode #56

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

Merged
merged 1 commit into from
Feb 22, 2016
Merged

improve development mode #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import './guard';

// cache
let tokensByFile = {};
// global
// globals;
let debugMode = process.env.NODE_ENV !== 'development';
let instance = extractor({}, fetch);
let processorOptions = {};
let preProcess = identity;
Expand All @@ -26,7 +27,7 @@ const debugSetup = debug('css-modules:setup');
* @param {string} options.to
* @param {object} options.rest
*/
export default function setup({ extensions: extraExtensions, preprocessCss, processCss, to, ...rest } = {}) {
export default function setup({ extensions: extraExtensions, preprocessCss, processCss, to, devMode, ...rest } = {}) {
debugSetup(arguments[0]);
validate(arguments[0]);
instance = extractor(rest, fetch);
Expand All @@ -36,6 +37,11 @@ export default function setup({ extensions: extraExtensions, preprocessCss, proc
// clearing cache
tokensByFile = {};

// debug option is preferred NODE_ENV === 'development'
if (typeof devMode !== 'undefined') {
debugMode = devMode;
}

if (extraExtensions) {
extraExtensions.forEach((extension) => hook(filename => fetch(filename, filename), extension));
}
Expand Down Expand Up @@ -69,7 +75,7 @@ function fetch(to, from) {

tokens = lazyResult.root.tokens;

if (process.env.NODE_ENV !== 'development') {
if (!debugMode) {
// updating cache
tokensByFile[filename] = tokens;
} else {
Expand Down
106 changes: 75 additions & 31 deletions test/cache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,91 @@ function updateFile(content) {
}

describe('development mode', () => {
describe('should cache calls not in development mode', () => {
before(() => {
hook();
updateFile('.block\n{\n display: block;\n}');
process.env.NODE_ENV = '';
require(fixture);
updateFile('.inline-block\n{\n display: inline-block;\n}');
});
describe('shouldn`t calls cache in development mode', () => {
describe('devMode:false options should override NODE_ENV="development"', () => {
before(() => {
hook({ devMode: false });
updateFile('.block\n{\n display: block;\n}');
process.env.NODE_ENV = 'development';
require(fixture);
updateFile('.inline-block\n{\n display: inline-block;\n}');
});

after(() => {
process.env.NODE_ENV = '';
dropCache(fixture);
});

after(() => {
process.env.NODE_ENV = '';
dropCache(fixture);
it('should retrive data from cache', () => {
const tokens = require(fixture);
const keys = Object.keys(tokens);
equal(keys.length, 1);
equal(keys.join(''), 'block');
});
});

it('should retrive data from cache', () => {
const tokens = require(fixture);
const keys = Object.keys(tokens);
equal(keys.length, 1);
equal(keys.join(''), 'block');
describe('should cache calls without any options', () => {
before(() => {
hook();
updateFile('.block\n{\n display: block;\n}');
require(fixture);
updateFile('.inline-block\n{\n display: inline-block;\n}');
});

after(() => {
dropCache(fixture);
});

it('should retrive data from cache', () => {
const tokens = require(fixture);
const keys = Object.keys(tokens);
equal(keys.length, 1);
equal(keys.join(''), 'block');
});
});
});

describe('should clear cache in development mode', () => {
before(() => {
hook();
updateFile('.block\n{\n display: block;\n}');
process.env.NODE_ENV = 'development';
require(fixture);
updateFile('.inline-block\n{\n display: inline-block;\n}');
});
describe('devMode:true option should works without NODE_ENV="development"', () => {
before(() => {
hook({ devMode: true });
updateFile('.block\n{\n display: block;\n}');
require(fixture);
updateFile('.inline-block\n{\n display: inline-block;\n}');
});

after(() => {
dropCache(fixture);
});

after(() => {
process.env.NODE_ENV = '';
dropCache(fixture);
it('should retrive data from fs', () => {
const tokens = require(fixture);
const keys = Object.keys(tokens);
equal(keys.length, 1);
equal(keys.join(''), 'inline-block');
});
});

it('should retrive data from fs', () => {
const tokens = require(fixture);
const keys = Object.keys(tokens);
equal(keys.length, 1);
equal(keys.join(''), 'inline-block');
describe('NODE_ENV="development" should works without debug:true option', () => {
before(() => {
hook();
updateFile('.block\n{\n display: block;\n}');
process.env.NODE_ENV = 'development';
require(fixture);
updateFile('.inline-block\n{\n display: inline-block;\n}');
});

after(() => {
process.env.NODE_ENV = '';
dropCache(fixture);
});

it('should retrive data from fs', () => {
const tokens = require(fixture);
const keys = Object.keys(tokens);
equal(keys.length, 1);
equal(keys.join(''), 'inline-block');
});
});
});
});