Skip to content

Updated functionality related to PostCSS - #307 #319

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated functionality related to PostCSS - #307 #319

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
6 changes: 0 additions & 6 deletions generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,6 @@ class AppGenerator extends Generators.Base {

install() {

// Currently buggy!
if(this.postcss) {
const postcss = require('./postcss');
postcss.write(path.join(this.destinationRoot(), 'conf/webpack/Base.js'));
}

if(!this.options['skip-install']) {
this.installDependencies({ bower: false });
}
Expand Down
99 changes: 0 additions & 99 deletions generators/app/postcss.js
View file
Open in desktop

This file was deleted.

77 changes: 34 additions & 43 deletions test/generators/app/indexTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,27 @@ describe('react-webpack:app without cssmodules support', () => {
});
});

describe('react-webpack:app without PostCSS support', () => {

let prompts = {};
for(let p of defaultPrompts) {
prompts[p.name] = p.default;
}
prompts.postcss = false;

before(() => {
return beforeLoad(prompts);
});

describe('#createFiles', () => {

it('should not add postcss and postcss-loader deps', () => {
assert.noFileContent('package.json', 'postcss');
assert.noFileContent('package.json', 'postcss-loader');
});
});
});

describe('react-webpack:app with PostCSS support', () => {

let prompts = {};
Expand Down Expand Up @@ -203,7 +224,14 @@ describe('react-webpack:app with PostCSS support', () => {
'.editorconfig',
'.eslintrc',
'.gitignore',
'.yo-rc.json'
'.yo-rc.json',
]);
});

it('should generate postcss.config.js', () => {

assert.file([
'postcss.config.js'
]);
});

Expand All @@ -225,48 +253,6 @@ describe('react-webpack:app with PostCSS support', () => {
]);
});

it('should insert the postcss loader into the style pipes', () => {
assert.fileContent('conf/webpack/Base.js', `{
loader: 'css-loader',
query: cssModulesQuery
},
{ loader: 'postcss-loader' }`);
assert.fileContent('conf/webpack/Base.js', `{ loader: 'css-loader' },
{ loader: 'postcss-loader' }`);
assert.fileContent('conf/webpack/Base.js', `{
loader: 'css-loader',
query: cssModulesQuery
},
{ loader: 'postcss-loader' },
{ loader: 'sass-loader' }`);
assert.fileContent('conf/webpack/Base.js', `{ loader: 'css-loader' },
{ loader: 'postcss-loader' },
{ loader: 'sass-loader' }`);
assert.fileContent('conf/webpack/Base.js', `{
loader: 'css-loader',
query: cssModulesQuery
},
{ loader: 'postcss-loader' },
{ loader: 'less-loader' }`);
assert.fileContent('conf/webpack/Base.js', `{ loader: 'css-loader' },
{ loader: 'postcss-loader' },
{ loader: 'less-loader' }`);
assert.fileContent('conf/webpack/Base.js', `{
loader: 'css-loader',
query: cssModulesQuery
},
{ loader: 'postcss-loader' },
{ loader: 'stylus-loader' }`);
assert.fileContent('conf/webpack/Base.js', `{ loader: 'css-loader' },
{ loader: 'postcss-loader' },
{ loader: 'stylus-loader' }`);
});

it('should append the postcss function to the base config', () => {

assert.fileContent('conf/webpack/Base.js', 'postcss: function () {');
});

it('should generate required source files', () => {

assert.file([
Expand All @@ -282,6 +268,11 @@ describe('react-webpack:app with PostCSS support', () => {
]);
});

it('should add postcss and postcss-loader deps', () => {
assert.fileContent('package.json', 'postcss');
assert.fileContent('package.json', 'postcss-loader');
});

it('should generate test configuration and basic tests', () => {

assert.file([
Expand Down
4 changes: 2 additions & 2 deletions utils/configopts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"name": "postcss",
"value": "postcss",
"packages": [
{ "name": "postcss", "version": "^5.0.21" },
{ "name": "postcss-loader", "version": "^0.9.1" }
{ "name": "postcss", "version": "^5.2.6" },
{ "name": "postcss-loader", "version": "^1.2.1" }
]
}
]
Expand Down