Skip to content

Commit 82f7118

Browse files
committed
Add postcss-apply to buid task and to webpack
1 parent 9a9396f commit 82f7118

File tree

5 files changed

+80
-56
lines changed

5 files changed

+80
-56
lines changed

gulpfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ gulp.task('css', function () {
2222
}),
2323
require('postcss-mixins')(),
2424
require('postcss-each')(),
25-
require('postcss-nested')(),
25+
require('postcss-apply')(),
26+
require('postcss-nesting')(),
2627
require('postcss-reporter')({ clearMessages: true })
2728
];
2829

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"eslint-import-resolver-webpack": "^0.8.1",
5454
"eslint-plugin-babel": "^4.1.1",
5555
"eslint-plugin-compat": "^1.0.2",
56-
"eslint-plugin-import": "^2.2.0",
56+
"eslint-plugin-import": "^2.3.0",
5757
"eslint-plugin-jsx-a11y": "^5.0.3",
5858
"eslint-plugin-react": "^7.0.1",
5959
"express": "^4.15.3",
@@ -66,16 +66,15 @@
6666
"gulp-rimraf": "^0.2.1",
6767
"identity-obj-proxy": "^3.0.0",
6868
"internal-ip": "^1.2.0",
69-
"jest": "^20.0.3",
69+
"jest": "^20.0.4",
7070
"lint-staged": "^3.4.2",
71-
"mocha": "^3.4.1",
7271
"normalize.css": "^7.0.0",
7372
"postcss-cssnext": "^2.11.0",
7473
"postcss-each": "^0.10.0",
7574
"postcss-import": "^10.0.0",
7675
"postcss-loader": "^2.0.5",
7776
"postcss-mixins": "^6.0.0",
78-
"postcss-nested": "^2.0.2",
77+
"postcss-nesting": "^4.0.1",
7978
"postcss-reporter": "^3.0.0",
8079
"pre-commit": "^1.2.2",
8180
"prop-types": "^15.5.10",

webpack/postcss.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ module.exports = {
88
},
99
'postcss-mixins': {},
1010
'postcss-each': {},
11+
'postcss-apply': {},
12+
'postcss-nesting': {},
1113
'postcss-cssnext': {},
12-
'postcss-nested': {},
1314
'postcss-reporter': {
1415
clearMessages: true
1516
}

webpack/webpack.config.dev.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = {
3333
include: /node_modules/,
3434
use: ExtractTextPlugin.extract({
3535
fallback: 'style-loader',
36-
loader: 'css-loader',
36+
use: 'css-loader',
3737
})
3838
}, {
3939
test: /\.css$/,
@@ -53,7 +53,6 @@ module.exports = {
5353
}, {
5454
loader: 'postcss-loader',
5555
options: {
56-
// context: path.join(__dirname, '../'),
5756
config: {
5857
path: path.join(__dirname, './postcss.config.js')
5958
}

yarn.lock

Lines changed: 72 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,9 +2334,9 @@ eslint-plugin-compat@^1.0.2:
23342334
caniuse-db "1.0.30000626"
23352335
requireindex "^1.1.0"
23362336

2337-
eslint-plugin-import@^2.2.0:
2338-
version "2.2.0"
2339-
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.%3Cspan%20class="x x-first x-last">2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e"
2337+
eslint-plugin-import@^2.3.0:
2338+
version "2.3.0"
2339+
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.%3Cspan%20class="x x-first x-last">3.0.tgz#37c801e0ada0e296cbdf20c3f393acb5b52af36b"
23402340
dependencies:
23412341
builtin-modules "^1.1.1"
23422342
contains-path "^0.1.0"
@@ -2347,7 +2347,7 @@ eslint-plugin-import@^2.2.0:
23472347
has "^1.0.1"
23482348
lodash.cond "^4.3.0"
23492349
minimatch "^3.0.3"
2350-
pkg-up "^1.0.0"
2350+
read-pkg-up "^2.0.0"
23512351

23522352
eslint-plugin-jsx-a11y@^5.0.3:
23532353
version "5.0.3"
@@ -2685,7 +2685,7 @@ find-up@^1.0.0:
26852685
path-exists "^2.0.0"
26862686
pinkie-promise "^2.0.0"
26872687

2688-
find-up@^2.1.0:
2688+
find-up@^2.0.0, find-up@^2.1.0:
26892689
version "2.1.0"
26902690
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
26912691
dependencies:
@@ -3690,9 +3690,9 @@ jest-changed-files@^20.0.3:
36903690
version "20.0.3"
36913691
resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-20.0.3.tgz#9394d5cc65c438406149bef1bf4d52b68e03e3f8"
36923692

3693-
jest-cli@^20.0.3:
3694-
version "20.0.3"
3695-
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.%3Cspan%20class="x x-first x-last">3.tgz#fe88ddbb7a9f3a16d0ed55339a0a2424f7f0d361"
3693+
jest-cli@^20.0.4:
3694+
version "20.0.4"
3695+
resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-20.0.%3Cspan%20class="x x-first x-last">4.tgz#e532b19d88ae5bc6c417e8b0593a6fe954b1dc93"
36963696
dependencies:
36973697
ansi-escapes "^1.4.0"
36983698
callsites "^2.0.0"
@@ -3704,15 +3704,15 @@ jest-cli@^20.0.3:
37043704
istanbul-lib-instrument "^1.4.2"
37053705
istanbul-lib-source-maps "^1.1.0"
37063706
jest-changed-files "^20.0.3"
3707-
jest-config "^20.0.3"
3707+
jest-config "^20.0.4"
37083708
jest-docblock "^20.0.3"
37093709
jest-environment-jsdom "^20.0.3"
3710-
jest-haste-map "^20.0.3"
3711-
jest-jasmine2 "^20.0.3"
3710+
jest-haste-map "^20.0.4"
3711+
jest-jasmine2 "^20.0.4"
37123712
jest-message-util "^20.0.3"
37133713
jest-regex-util "^20.0.3"
37143714
jest-resolve-dependencies "^20.0.3"
3715-
jest-runtime "^20.0.3"
3715+
jest-runtime "^20.0.4"
37163716
jest-snapshot "^20.0.3"
37173717
jest-util "^20.0.3"
37183718
micromatch "^2.3.11"
@@ -3725,18 +3725,18 @@ jest-cli@^20.0.3:
37253725
worker-farm "^1.3.1"
37263726
yargs "^7.0.2"
37273727

3728-
jest-config@^20.0.3:
3729-
version "20.0.3"
3730-
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-20.0.%3Cspan%20class="x x-first x-last">3.tgz#a934f27eea764915801cdda26f6f8eec2ac79266"
3728+
jest-config@^20.0.4:
3729+
version "20.0.4"
3730+
resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-20.0.%3Cspan%20class="x x-first x-last">4.tgz#e37930ab2217c913605eff13e7bd763ec48faeea"
37313731
dependencies:
37323732
chalk "^1.1.3"
37333733
glob "^7.1.1"
37343734
jest-environment-jsdom "^20.0.3"
37353735
jest-environment-node "^20.0.3"
3736-
jest-jasmine2 "^20.0.3"
3736+
jest-jasmine2 "^20.0.4"
37373737
jest-matcher-utils "^20.0.3"
37383738
jest-regex-util "^20.0.3"
3739-
jest-resolve "^20.0.3"
3739+
jest-resolve "^20.0.4"
37403740
jest-validate "^20.0.3"
37413741
pretty-format "^20.0.3"
37423742

@@ -3768,9 +3768,9 @@ jest-environment-node@^20.0.3:
37683768
jest-mock "^20.0.3"
37693769
jest-util "^20.0.3"
37703770

3771-
jest-haste-map@^20.0.3:
3772-
version "20.0.3"
3773-
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.%3Cspan%20class="x x-first x-last">3.tgz#6377d537eaf34eb5f75121a691cae3fde82ba971"
3771+
jest-haste-map@^20.0.4:
3772+
version "20.0.4"
3773+
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.%3Cspan%20class="x x-first x-last">4.tgz#653eb55c889ce3c021f7b94693f20a4159badf03"
37743774
dependencies:
37753775
fb-watchman "^2.0.0"
37763776
graceful-fs "^4.1.11"
@@ -3779,9 +3779,9 @@ jest-haste-map@^20.0.3:
37793779
sane "~1.6.0"
37803780
worker-farm "^1.3.1"
37813781

3782-
jest-jasmine2@^20.0.3:
3783-
version "20.0.3"
3784-
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-20.0.%3Cspan%20class="x x-first x-last">3.tgz#18c4e9d029da7ed1ae727c55300064d1a0542974"
3782+
jest-jasmine2@^20.0.4:
3783+
version "20.0.4"
3784+
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-20.0.%3Cspan%20class="x x-first x-last">4.tgz#fcc5b1411780d911d042902ef1859e852e60d5e1"
37853785
dependencies:
37863786
chalk "^1.1.3"
37873787
graceful-fs "^4.1.11"
@@ -3831,28 +3831,28 @@ jest-resolve-dependencies@^20.0.3:
38313831
dependencies:
38323832
jest-regex-util "^20.0.3"
38333833

3834-
jest-resolve@^20.0.3:
3835-
version "20.0.3"
3836-
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-20.0.%3Cspan%20class="x x-first x-last">3.tgz#375307aa40f78532d40ff8b17d5300b1519f8dd4"
3834+
jest-resolve@^20.0.4:
3835+
version "20.0.4"
3836+
resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-20.0.%3Cspan%20class="x x-first x-last">4.tgz#9448b3e8b6bafc15479444c6499045b7ffe597a5"
38373837
dependencies:
38383838
browser-resolve "^1.11.2"
38393839
is-builtin-module "^1.0.0"
38403840
resolve "^1.3.2"
38413841

3842-
jest-runtime@^20.0.3:
3843-
version "20.0.3"
3844-
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-20.0.%3Cspan%20class="x x-first x-last">3.tgz#dddd22bbc429e26e6a96d1acd46ca55714b09252"
3842+
jest-runtime@^20.0.4:
3843+
version "20.0.4"
3844+
resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-20.0.%3Cspan%20class="x x-first x-last">4.tgz#a2c802219c4203f754df1404e490186169d124d8"
38453845
dependencies:
38463846
babel-core "^6.0.0"
38473847
babel-jest "^20.0.3"
38483848
babel-plugin-istanbul "^4.0.0"
38493849
chalk "^1.1.3"
38503850
convert-source-map "^1.4.0"
38513851
graceful-fs "^4.1.11"
3852-
jest-config "^20.0.3"
3853-
jest-haste-map "^20.0.3"
3852+
jest-config "^20.0.4"
3853+
jest-haste-map "^20.0.4"
38543854
jest-regex-util "^20.0.3"
3855-
jest-resolve "^20.0.3"
3855+
jest-resolve "^20.0.4"
38563856
jest-util "^20.0.3"
38573857
json-stable-stringify "^1.0.1"
38583858
micromatch "^2.3.11"
@@ -3891,11 +3891,11 @@ jest-validate@^20.0.3:
38913891
leven "^2.1.0"
38923892
pretty-format "^20.0.3"
38933893

3894-
jest@^20.0.3:
3895-
version "20.0.3"
3896-
resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.%3Cspan%20class="x x-first x-last">3.tgz#e4fd054c4f1170a116a00761da4cfdb73f1cdc33"
3894+
jest@^20.0.4:
3895+
version "20.0.4"
3896+
resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.%3Cspan%20class="x x-first x-last">4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac"
38973897
dependencies:
3898-
jest-cli "^20.0.3"
3898+
jest-cli "^20.0.4"
38993899

39003900
jodid25519@^1.0.0:
39013901
version "1.0.2"
@@ -4142,6 +4142,15 @@ load-json-file@^1.0.0:
41424142
pinkie-promise "^2.0.0"
41434143
strip-bom "^2.0.0"
41444144

4145+
load-json-file@^2.0.0:
4146+
version "2.0.0"
4147+
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
4148+
dependencies:
4149+
graceful-fs "^4.1.2"
4150+
parse-json "^2.2.0"
4151+
pify "^2.0.0"
4152+
strip-bom "^3.0.0"
4153+
41454154
loader-runner@^2.3.0:
41464155
version "2.3.0"
41474156
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
@@ -5126,6 +5135,12 @@ path-type@^1.0.0:
51265135
pify "^2.0.0"
51275136
pinkie-promise "^2.0.0"
51285137

5138+
path-type@^2.0.0:
5139+
version "2.0.0"
5140+
resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
5141+
dependencies:
5142+
pify "^2.0.0"
5143+
51295144
pbkdf2@^3.0.3:
51305145
version "3.0.12"
51315146
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2"
@@ -5175,12 +5190,6 @@ pkg-dir@^1.0.0:
51755190
dependencies:
51765191
find-up "^1.0.0"
51775192

5178-
pkg-up@^1.0.0:
5179-
version "1.0.0"
5180-
resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26"
5181-
dependencies:
5182-
find-up "^1.0.0"
5183-
51845193
pleeease-filters@^3.0.0:
51855194
version "3.0.1"
51865195
resolved "https://registry.yarnpkg.com/pleeease-filters/-/pleeease-filters-3.0.1.tgz#4dfe0e8f1046613517c64b728bc80608a7ebf22f"
@@ -5593,18 +5602,18 @@ postcss-modules-values@^1.1.0:
55935602
icss-replace-symbols "^1.1.0"
55945603
postcss "^6.0.1"
55955604

5596-
postcss-nested@^2.0.2:
5597-
version "2.0.2"
5598-
resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.0.2.tgz#f38fad547f5c3747160aec3bb34745819252974a"
5599-
dependencies:
5600-
postcss "^6.0.1"
5601-
56025605
postcss-nesting@^2.0.5:
56035606
version "2.3.1"
56045607
resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-2.3.1.tgz#94a6b6a4ef707fbec20a87fee5c957759b4e01cf"
56055608
dependencies:
56065609
postcss "^5.0.19"
56075610

5611+
postcss-nesting@^4.0.1:
5612+
version "4.0.1"
5613+
resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-4.0.1.tgz#8fc2ce40cbfcfab7ee24e7b68fb6ebe84b641469"
5614+
dependencies:
5615+
postcss "^6.0.1"
5616+
56085617
postcss-normalize-charset@^1.1.0:
56095618
version "1.1.1"
56105619
resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
@@ -6020,6 +6029,13 @@ read-pkg-up@^1.0.1:
60206029
find-up "^1.0.0"
60216030
read-pkg "^1.0.0"
60226031

6032+
read-pkg-up@^2.0.0:
6033+
version "2.0.0"
6034+
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
6035+
dependencies:
6036+
find-up "^2.0.0"
6037+
read-pkg "^2.0.0"
6038+
60236039
read-pkg@^1.0.0:
60246040
version "1.1.0"
60256041
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -6028,6 +6044,14 @@ read-pkg@^1.0.0:
60286044
normalize-package-data "^2.3.2"
60296045
path-type "^1.0.0"
60306046

6047+
read-pkg@^2.0.0:
6048+
version "2.0.0"
6049+
resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
6050+
dependencies:
6051+
load-json-file "^2.0.0"
6052+
normalize-package-data "^2.3.2"
6053+
path-type "^2.0.0"
6054+
60316055
"readable-stream@>=1.0.33-1 <1.1.0-0":
60326056
version "1.0.34"
60336057
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"

0 commit comments

Comments
 (0)