Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix postcss loader configuration

Browse Source
This commit is contained in:
Sérgio Ramos 2016-10-24 17:38:16 +01:00
parent f2c1ac12f9
commit f9a631f26e
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/package.json
View File

@ -72,6 +72,7 @@
"nyc": "^8.3.1", "nyc": "^8.3.1",
"postcss-cssnext": "^2.8.0", "postcss-cssnext": "^2.8.0",
"postcss-loader": "^1.0.0", "postcss-loader": "^1.0.0",
"postcss-modules-values": "^1.2.2",
"pre-commit": "^1.1.3", "pre-commit": "^1.1.3",
"react-addons-test-utils": "^15.3.2", "react-addons-test-utils": "^15.3.2",
"style-loader": "^0.13.1", "style-loader": "^0.13.1",

11
frontend/webpack/base.js
View File

@ -13,14 +13,13 @@ const plugins = {
'loader-options-plugin': new webpack.LoaderOptionsPlugin({ 'loader-options-plugin': new webpack.LoaderOptionsPlugin({
options: { options: {
postcss: { postcss: {
plugins: () => { plugins: [
return [ require('postcss-modules-values'),
require('postcss-cssnext') require('postcss-cssnext')()
]; ]
}
} }
} }
}), })
'define-plugin': new webpack.DefinePlugin({ 'define-plugin': new webpack.DefinePlugin({
'process.env': { 'process.env': {
NODE_ENV: JSON.stringify(process.env['NODE_ENV'] || 'development'), NODE_ENV: JSON.stringify(process.env['NODE_ENV'] || 'development'),

2
frontend/yarn.lock
View File

@ -4654,7 +4654,7 @@ postcss-modules-scope@^1.0.0:
css-selector-tokenizer "^0.6.0" css-selector-tokenizer "^0.6.0"
postcss "^5.0.4" postcss "^5.0.4"
postcss-modules-values@^1.1.0: postcss-modules-values, postcss-modules-values@^1.1.0:
version "1.2.2" version "1.2.2"
resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
dependencies: dependencies:

2
ui/package.json
View File

@ -12,6 +12,7 @@
"build-docs-static": "sh scripts/build-docs-static.sh" "build-docs-static": "sh scripts/build-docs-static.sh"
}, },
"dependencies": { "dependencies": {
"classnames": "^2.2.5",
"react": "^15.3.2" "react": "^15.3.2"
}, },
"devDependencies": { "devDependencies": {
@ -41,6 +42,7 @@
"nyc": "^8.3.1", "nyc": "^8.3.1",
"postcss-cssnext": "^2.8.0", "postcss-cssnext": "^2.8.0",
"postcss-loader": "^1.0.0", "postcss-loader": "^1.0.0",
"postcss-modules-values": "^1.2.2",
"pre-commit": "^1.1.3", "pre-commit": "^1.1.3",
"raw-loader": "^0.5.1", "raw-loader": "^0.5.1",
"react-addons-test-utils": "^15.3.2", "react-addons-test-utils": "^15.3.2",

9
ui/webpack/base.js
View File

@ -11,11 +11,10 @@ const plugins = {
'loader-options-plugin': new webpack.LoaderOptionsPlugin({ 'loader-options-plugin': new webpack.LoaderOptionsPlugin({
options: { options: {
postcss: { postcss: {
plugins: () => { plugins: [
return [ require('postcss-modules-values'),
require('postcss-cssnext') require('postcss-cssnext')()
]; ]
}
}, },
'embed-markdown-loader': { 'embed-markdown-loader': {
// don't detach yet (has a bug in the production config) // don't detach yet (has a bug in the production config)

6
ui/yarn.lock
View File

@ -1394,6 +1394,10 @@ clap@^1.0.9:
dependencies: dependencies:
chalk "^1.1.3" chalk "^1.1.3"
classnames@^2.2.5:
version "2.2.5"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
clean-yaml-object@^0.1.0: clean-yaml-object@^0.1.0:
version "0.1.0" version "0.1.0"
resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68" resolved "https://registry.yarnpkg.com/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz#63fb110dc2ce1a84dc21f6d9334876d010ae8b68"
@ -4474,7 +4478,7 @@ postcss-modules-scope@^1.0.0:
css-selector-tokenizer "^0.6.0" css-selector-tokenizer "^0.6.0"
postcss "^5.0.4" postcss "^5.0.4"
postcss-modules-values@^1.1.0: postcss-modules-values@^1.1.0, postcss-modules-values@^1.2.2:
version "1.2.2" version "1.2.2"
resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
dependencies: dependencies: