From fe4024cdc9b9ae3e3ce744ce0e96b25e4bdffcba Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 28 Sep 2018 14:13:31 +0800 Subject: [PATCH] [improvement] update css extension name (#662) --- build/compiler.js | 6 ++-- dist/area/index.js | 8 ++--- package.json | 1 - .../action-sheet/{index.pcss => index.css} | 4 +-- packages/area/{index.pcss => index.css} | 2 +- packages/area/index.ts | 1 - packages/badge-group/index.css | 6 ++++ packages/badge-group/index.pcss | 6 ---- packages/badge/{index.pcss => index.css} | 4 +-- packages/button/{index.pcss => index.css} | 2 +- packages/card/{index.pcss => index.css} | 4 +-- packages/cell-group/index.css | 2 ++ packages/cell-group/index.pcss | 2 -- packages/cell/{index.pcss => index.css} | 4 +-- packages/col/{index.pcss => index.css} | 0 packages/common/index.css | 8 +++++ packages/common/index.pcss | 8 ----- .../style/{clearfix.pcss => clearfix.css} | 2 +- .../style/{ellipsis.pcss => ellipsis.css} | 2 +- .../style/{hairline.pcss => hairline.css} | 2 +- .../mixins/{clearfix.pcss => clearfix.css} | 0 .../mixins/{ellipsis.pcss => ellipsis.css} | 0 .../mixins/{hairline.pcss => hairline.css} | 0 packages/common/style/{var.pcss => var.css} | 0 packages/dialog/{index.pcss => index.css} | 4 +-- packages/field/{index.pcss => index.css} | 2 +- packages/icon/{index.pcss => index.css} | 2 +- packages/loading/{index.pcss => index.css} | 2 +- packages/nav-bar/{index.pcss => index.css} | 2 +- packages/notice-bar/{index.pcss => index.css} | 0 packages/notify/{index.pcss => index.css} | 2 +- packages/overlay/{index.pcss => index.css} | 0 packages/panel/{index.pcss => index.css} | 4 +-- packages/popup/{index.pcss => index.css} | 2 +- packages/progress/{index.pcss => index.css} | 2 +- .../radio-group/{index.pcss => index.css} | 2 +- packages/radio/{index.pcss => index.css} | 2 +- packages/row/{index.pcss => index.css} | 0 packages/search/{index.pcss => index.css} | 2 +- packages/slider/{index.pcss => index.css} | 2 +- packages/stepper/{index.pcss => index.css} | 2 +- packages/steps/{index.pcss => index.css} | 4 +-- packages/submit-bar/{index.pcss => index.css} | 2 +- .../switch-cell/{index.pcss => index.css} | 2 +- packages/switch/{index.pcss => index.css} | 2 +- .../tabbar-item/{index.pcss => index.css} | 2 +- packages/tabbar/{index.pcss => index.css} | 2 +- packages/tabs/{index.pcss => index.css} | 4 +-- packages/tag/{index.pcss => index.css} | 4 +-- packages/toast/{index.pcss => index.css} | 2 +- packages/transition/{index.pcss => index.css} | 0 .../tree-select/{index.pcss => index.css} | 4 +-- postcss.config.js | 3 -- yarn.lock | 31 +------------------ 54 files changed, 67 insertions(+), 101 deletions(-) rename packages/action-sheet/{index.pcss => index.css} (92%) rename packages/area/{index.pcss => index.css} (96%) create mode 100644 packages/badge-group/index.css delete mode 100644 packages/badge-group/index.pcss rename packages/badge/{index.pcss => index.css} (92%) rename packages/button/{index.pcss => index.css} (98%) rename packages/card/{index.pcss => index.css} (93%) create mode 100644 packages/cell-group/index.css delete mode 100644 packages/cell-group/index.pcss rename packages/cell/{index.pcss => index.css} (93%) rename packages/col/{index.pcss => index.css} (100%) create mode 100644 packages/common/index.css delete mode 100644 packages/common/index.pcss rename packages/common/style/{clearfix.pcss => clearfix.css} (54%) rename packages/common/style/{ellipsis.pcss => ellipsis.css} (82%) rename packages/common/style/{hairline.pcss => hairline.css} (94%) rename packages/common/style/mixins/{clearfix.pcss => clearfix.css} (100%) rename packages/common/style/mixins/{ellipsis.pcss => ellipsis.css} (100%) rename packages/common/style/mixins/{hairline.pcss => hairline.css} (100%) rename packages/common/style/{var.pcss => var.css} (100%) rename packages/dialog/{index.pcss => index.css} (91%) rename packages/field/{index.pcss => index.css} (97%) rename packages/icon/{index.pcss => index.css} (99%) rename packages/loading/{index.pcss => index.css} (96%) rename packages/nav-bar/{index.pcss => index.css} (95%) rename packages/notice-bar/{index.pcss => index.css} (100%) rename packages/notify/{index.pcss => index.css} (85%) rename packages/overlay/{index.pcss => index.css} (100%) rename packages/panel/{index.pcss => index.css} (61%) rename packages/popup/{index.pcss => index.css} (98%) rename packages/progress/{index.pcss => index.css} (94%) rename packages/radio-group/{index.pcss => index.css} (95%) rename packages/radio/{index.pcss => index.css} (95%) rename packages/row/{index.pcss => index.css} (100%) rename packages/search/{index.pcss => index.css} (94%) rename packages/slider/{index.pcss => index.css} (94%) rename packages/stepper/{index.pcss => index.css} (97%) rename packages/steps/{index.pcss => index.css} (97%) rename packages/submit-bar/{index.pcss => index.css} (94%) rename packages/switch-cell/{index.pcss => index.css} (75%) rename packages/switch/{index.pcss => index.css} (95%) rename packages/tabbar-item/{index.pcss => index.css} (94%) rename packages/tabbar/{index.pcss => index.css} (79%) rename packages/tabs/{index.pcss => index.css} (95%) rename packages/tag/{index.pcss => index.css} (90%) rename packages/toast/{index.pcss => index.css} (95%) rename packages/transition/{index.pcss => index.css} (100%) rename packages/tree-select/{index.pcss => index.css} (91%) diff --git a/build/compiler.js b/build/compiler.js index ef6f0257..4d53495e 100644 --- a/build/compiler.js +++ b/build/compiler.js @@ -8,15 +8,15 @@ const rename = require('gulp-rename'); const isProduction = process.env.NODE_ENV === 'production'; const src = path.join(__dirname, '../packages'); const dist = path.join(__dirname, isProduction ? '../dist' : '../example/dist'); -const ext = ['js', 'ts', 'pcss', 'json', 'wxml']; +const ext = ['js', 'ts', 'css', 'json', 'wxml']; function copy(ext) { return gulp.src([src + '/**/*.' + ext]).pipe(gulp.dest(dist)); } -gulp.task('compile-pcss', () => { +gulp.task('compile-css', () => { return gulp - .src([src + '/**/*.pcss']) + .src([src + '/**/*.css']) .pipe(postcss()) .pipe(cssmin()) .pipe( diff --git a/dist/area/index.js b/dist/area/index.js index aadacf9e..5ab503a7 100644 --- a/dist/area/index.js +++ b/dist/area/index.js @@ -61,13 +61,13 @@ VantComponent({ displayColumns = _this$data2.displayColumns; var index = pickerValue.findIndex(function (item, index) { return item !== value[index]; - }); // 没有变更 或 选中项序号小于0 不处理 + }); + var values = displayColumns[index]; - if (index < 0 || value[index] < 0) { + if (!value[index] || !values[value[index]]) { return; } - var values = displayColumns[index]; this.code = values[value[index]].code; this.setValues(); this.$emit('change', { @@ -113,7 +113,7 @@ VantComponent({ return 0; }, setValues: function setValues() { - var code = this.code || Object.keys(this.data.areaList.county_list)[0] || ''; + var code = this.code || Object.keys(this.data.areaList.county_list || {})[0] || ''; var province = this.getList('province'); var city = this.getList('city', code.slice(0, 2)); this.setData({ diff --git a/package.json b/package.json index d1e18d40..c4826d36 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "gulp-rename": "^1.2.2", "html-webpack-plugin": "^3.2.0", "postcss-calc": "^6.0.2", - "postcss-easy-import": "^3.0.0", "postcss-loader": "^3.0.0", "precss": "^3.1.2", "progress-bar-webpack-plugin": "^1.11.0", diff --git a/packages/action-sheet/index.pcss b/packages/action-sheet/index.css similarity index 92% rename from packages/action-sheet/index.pcss rename to packages/action-sheet/index.css index f31e8eaa..5b62239d 100644 --- a/packages/action-sheet/index.pcss +++ b/packages/action-sheet/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; .van-action-sheet { color: $text-color; diff --git a/packages/area/index.pcss b/packages/area/index.css similarity index 96% rename from packages/area/index.pcss rename to packages/area/index.css index 44bfbabe..a427a137 100644 --- a/packages/area/index.pcss +++ b/packages/area/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-picker { -webkit-text-size-adjust: 100%; /* avoid iOS text size adjust */ diff --git a/packages/area/index.ts b/packages/area/index.ts index 90aa7f8f..250e9de1 100644 --- a/packages/area/index.ts +++ b/packages/area/index.ts @@ -70,7 +70,6 @@ VantComponent({ const index = pickerValue.findIndex((item, index) => item !== value[index]); const values = displayColumns[index]; - // 没有变更 或 选中项序号小于0 不处理 if (!value[index] || !values[value[index]]) { return; } diff --git a/packages/badge-group/index.css b/packages/badge-group/index.css new file mode 100644 index 00000000..a9e2b9d2 --- /dev/null +++ b/packages/badge-group/index.css @@ -0,0 +1,6 @@ +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; + +.van-badge-group { + width: 85px; +} diff --git a/packages/badge-group/index.pcss b/packages/badge-group/index.pcss deleted file mode 100644 index 347d613e..00000000 --- a/packages/badge-group/index.pcss +++ /dev/null @@ -1,6 +0,0 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; - -.van-badge-group { - width: 85px; -} diff --git a/packages/badge/index.pcss b/packages/badge/index.css similarity index 92% rename from packages/badge/index.pcss rename to packages/badge/index.css index cacba174..9ed32d25 100644 --- a/packages/badge/index.pcss +++ b/packages/badge/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; .van-badge { display: block; diff --git a/packages/button/index.pcss b/packages/button/index.css similarity index 98% rename from packages/button/index.pcss rename to packages/button/index.css index ff3c600a..9c235cf0 100644 --- a/packages/button/index.pcss +++ b/packages/button/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-button { position: relative; diff --git a/packages/card/index.pcss b/packages/card/index.css similarity index 93% rename from packages/card/index.pcss rename to packages/card/index.css index 6dfca8f6..01917fe1 100644 --- a/packages/card/index.pcss +++ b/packages/card/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/mixins/ellipsis.pcss'; +@import '../common/style/var.css'; +@import '../common/style/mixins/ellipsis.css'; .van-card { color: $text-color; diff --git a/packages/cell-group/index.css b/packages/cell-group/index.css new file mode 100644 index 00000000..0bc00af8 --- /dev/null +++ b/packages/cell-group/index.css @@ -0,0 +1,2 @@ +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; diff --git a/packages/cell-group/index.pcss b/packages/cell-group/index.pcss deleted file mode 100644 index b0989df2..00000000 --- a/packages/cell-group/index.pcss +++ /dev/null @@ -1,2 +0,0 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; diff --git a/packages/cell/index.pcss b/packages/cell/index.css similarity index 93% rename from packages/cell/index.pcss rename to packages/cell/index.css index 3528eced..38311792 100644 --- a/packages/cell/index.pcss +++ b/packages/cell/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; .van-cell { width: 100%; diff --git a/packages/col/index.pcss b/packages/col/index.css similarity index 100% rename from packages/col/index.pcss rename to packages/col/index.css diff --git a/packages/common/index.css b/packages/common/index.css new file mode 100644 index 00000000..6347e66d --- /dev/null +++ b/packages/common/index.css @@ -0,0 +1,8 @@ +/** + * Entry of basic styles + */ + +@import "./style/var.css"; +@import "./style/ellipsis.css"; +@import "./style/clearfix.css"; +@import "./style/hairline.css"; diff --git a/packages/common/index.pcss b/packages/common/index.pcss deleted file mode 100644 index 0c594808..00000000 --- a/packages/common/index.pcss +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Entry of basic styles - */ - -@import "./style/var.pcss"; -@import "./style/ellipsis.pcss"; -@import "./style/clearfix.pcss"; -@import "./style/hairline.pcss"; diff --git a/packages/common/style/clearfix.pcss b/packages/common/style/clearfix.css similarity index 54% rename from packages/common/style/clearfix.pcss rename to packages/common/style/clearfix.css index 9561f1ff..0619a156 100644 --- a/packages/common/style/clearfix.pcss +++ b/packages/common/style/clearfix.css @@ -1,4 +1,4 @@ -@import './mixins/clearfix.pcss'; +@import './mixins/clearfix.css'; .van-clearfix { @include clearfix; diff --git a/packages/common/style/ellipsis.pcss b/packages/common/style/ellipsis.css similarity index 82% rename from packages/common/style/ellipsis.pcss rename to packages/common/style/ellipsis.css index 7103ea39..fc6ce80b 100644 --- a/packages/common/style/ellipsis.pcss +++ b/packages/common/style/ellipsis.css @@ -1,4 +1,4 @@ -@import './mixins/ellipsis.pcss'; +@import './mixins/ellipsis.css'; .van-ellipsis { @include ellipsis; diff --git a/packages/common/style/hairline.pcss b/packages/common/style/hairline.css similarity index 94% rename from packages/common/style/hairline.pcss rename to packages/common/style/hairline.css index 8a3537a6..90b2fcc7 100644 --- a/packages/common/style/hairline.pcss +++ b/packages/common/style/hairline.css @@ -1,4 +1,4 @@ -@import "./mixins/hairline.pcss"; +@import "./mixins/hairline.css"; .van-hairline, .van-hairline--top, diff --git a/packages/common/style/mixins/clearfix.pcss b/packages/common/style/mixins/clearfix.css similarity index 100% rename from packages/common/style/mixins/clearfix.pcss rename to packages/common/style/mixins/clearfix.css diff --git a/packages/common/style/mixins/ellipsis.pcss b/packages/common/style/mixins/ellipsis.css similarity index 100% rename from packages/common/style/mixins/ellipsis.pcss rename to packages/common/style/mixins/ellipsis.css diff --git a/packages/common/style/mixins/hairline.pcss b/packages/common/style/mixins/hairline.css similarity index 100% rename from packages/common/style/mixins/hairline.pcss rename to packages/common/style/mixins/hairline.css diff --git a/packages/common/style/var.pcss b/packages/common/style/var.css similarity index 100% rename from packages/common/style/var.pcss rename to packages/common/style/var.css diff --git a/packages/dialog/index.pcss b/packages/dialog/index.css similarity index 91% rename from packages/dialog/index.pcss rename to packages/dialog/index.css index fb5de1f7..147f9d00 100644 --- a/packages/dialog/index.pcss +++ b/packages/dialog/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; .van-dialog { width: 85%; diff --git a/packages/field/index.pcss b/packages/field/index.css similarity index 97% rename from packages/field/index.pcss rename to packages/field/index.css index 4638021f..f92931d7 100644 --- a/packages/field/index.pcss +++ b/packages/field/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-field { &__body { diff --git a/packages/icon/index.pcss b/packages/icon/index.css similarity index 99% rename from packages/icon/index.pcss rename to packages/icon/index.css index 010b295c..0ffbec34 100644 --- a/packages/icon/index.pcss +++ b/packages/icon/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; @font-face { font-style: normal; diff --git a/packages/loading/index.pcss b/packages/loading/index.css similarity index 96% rename from packages/loading/index.pcss rename to packages/loading/index.css index 53f0f922..4f2ac435 100644 --- a/packages/loading/index.pcss +++ b/packages/loading/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-loading { z-index: 0; diff --git a/packages/nav-bar/index.pcss b/packages/nav-bar/index.css similarity index 95% rename from packages/nav-bar/index.pcss rename to packages/nav-bar/index.css index f9acffe7..7ff27bc1 100644 --- a/packages/nav-bar/index.pcss +++ b/packages/nav-bar/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-nav-bar { height: 46px; diff --git a/packages/notice-bar/index.pcss b/packages/notice-bar/index.css similarity index 100% rename from packages/notice-bar/index.pcss rename to packages/notice-bar/index.css diff --git a/packages/notify/index.pcss b/packages/notify/index.css similarity index 85% rename from packages/notify/index.pcss rename to packages/notify/index.css index c04e3064..d0203e45 100644 --- a/packages/notify/index.pcss +++ b/packages/notify/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-notify { top: 0; diff --git a/packages/overlay/index.pcss b/packages/overlay/index.css similarity index 100% rename from packages/overlay/index.pcss rename to packages/overlay/index.css diff --git a/packages/panel/index.pcss b/packages/panel/index.css similarity index 61% rename from packages/panel/index.pcss rename to packages/panel/index.css index d9c38844..a4c57368 100644 --- a/packages/panel/index.pcss +++ b/packages/panel/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; .van-panel { background: $white; diff --git a/packages/popup/index.pcss b/packages/popup/index.css similarity index 98% rename from packages/popup/index.pcss rename to packages/popup/index.css index 8284c3c9..b139ef01 100644 --- a/packages/popup/index.pcss +++ b/packages/popup/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-popup { top: 50%; diff --git a/packages/progress/index.pcss b/packages/progress/index.css similarity index 94% rename from packages/progress/index.pcss rename to packages/progress/index.css index aadbef09..95694546 100644 --- a/packages/progress/index.pcss +++ b/packages/progress/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-progress { height: 4px; diff --git a/packages/radio-group/index.pcss b/packages/radio-group/index.css similarity index 95% rename from packages/radio-group/index.pcss rename to packages/radio-group/index.css index b000b913..f1267f97 100644 --- a/packages/radio-group/index.pcss +++ b/packages/radio-group/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; $van-radio-size: 20px; diff --git a/packages/radio/index.pcss b/packages/radio/index.css similarity index 95% rename from packages/radio/index.pcss rename to packages/radio/index.css index 7ba26c83..412ad6d2 100644 --- a/packages/radio/index.pcss +++ b/packages/radio/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; $van-radio-size: 20px; diff --git a/packages/row/index.pcss b/packages/row/index.css similarity index 100% rename from packages/row/index.pcss rename to packages/row/index.css diff --git a/packages/search/index.pcss b/packages/search/index.css similarity index 94% rename from packages/search/index.pcss rename to packages/search/index.css index 2bbd4c81..20cc2bcd 100644 --- a/packages/search/index.pcss +++ b/packages/search/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-search { display: flex; diff --git a/packages/slider/index.pcss b/packages/slider/index.css similarity index 94% rename from packages/slider/index.pcss rename to packages/slider/index.css index 85203a66..e11fa1ab 100644 --- a/packages/slider/index.pcss +++ b/packages/slider/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-slider { position: relative; diff --git a/packages/stepper/index.pcss b/packages/stepper/index.css similarity index 97% rename from packages/stepper/index.pcss rename to packages/stepper/index.css index 4e286e0a..99ad7652 100644 --- a/packages/stepper/index.pcss +++ b/packages/stepper/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-stepper { font-size: 0; diff --git a/packages/steps/index.pcss b/packages/steps/index.css similarity index 97% rename from packages/steps/index.pcss rename to packages/steps/index.css index 568986a7..dfa284e7 100644 --- a/packages/steps/index.pcss +++ b/packages/steps/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; .van-steps { overflow: hidden; diff --git a/packages/submit-bar/index.pcss b/packages/submit-bar/index.css similarity index 94% rename from packages/submit-bar/index.pcss rename to packages/submit-bar/index.css index 74c32ad4..8de9241e 100644 --- a/packages/submit-bar/index.pcss +++ b/packages/submit-bar/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-submit-bar { z-index: 100; diff --git a/packages/switch-cell/index.pcss b/packages/switch-cell/index.css similarity index 75% rename from packages/switch-cell/index.pcss rename to packages/switch-cell/index.css index b168a917..14b5da06 100644 --- a/packages/switch-cell/index.pcss +++ b/packages/switch-cell/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-switch-cell { padding-top: 8px; diff --git a/packages/switch/index.pcss b/packages/switch/index.css similarity index 95% rename from packages/switch/index.pcss rename to packages/switch/index.css index 2e5435f3..6aa5fae6 100644 --- a/packages/switch/index.pcss +++ b/packages/switch/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-switch { height: 1em; diff --git a/packages/tabbar-item/index.pcss b/packages/tabbar-item/index.css similarity index 94% rename from packages/tabbar-item/index.pcss rename to packages/tabbar-item/index.css index 42df0536..b7176400 100644 --- a/packages/tabbar-item/index.pcss +++ b/packages/tabbar-item/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-tabbar-item { float: left; diff --git a/packages/tabbar/index.pcss b/packages/tabbar/index.css similarity index 79% rename from packages/tabbar/index.pcss rename to packages/tabbar/index.css index 5c82251b..56a627a4 100644 --- a/packages/tabbar/index.pcss +++ b/packages/tabbar/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-tabbar { width: 100%; diff --git a/packages/tabs/index.pcss b/packages/tabs/index.css similarity index 95% rename from packages/tabs/index.pcss rename to packages/tabs/index.css index 901214fc..96aac54f 100644 --- a/packages/tabs/index.pcss +++ b/packages/tabs/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; $van-tabs-line-height: 44px; $van-tabs-card-height: 30px; diff --git a/packages/tag/index.pcss b/packages/tag/index.css similarity index 90% rename from packages/tag/index.pcss rename to packages/tag/index.css index 367d2397..93d2f924 100644 --- a/packages/tag/index.pcss +++ b/packages/tag/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/hairline.pcss'; +@import '../common/style/var.css'; +@import '../common/style/hairline.css'; .van-tag { display: inline-block; diff --git a/packages/toast/index.pcss b/packages/toast/index.css similarity index 95% rename from packages/toast/index.pcss rename to packages/toast/index.css index df7a5a0b..1532deae 100644 --- a/packages/toast/index.pcss +++ b/packages/toast/index.css @@ -1,4 +1,4 @@ -@import '../common/style/var.pcss'; +@import '../common/style/var.css'; .van-toast { display: flex; diff --git a/packages/transition/index.pcss b/packages/transition/index.css similarity index 100% rename from packages/transition/index.pcss rename to packages/transition/index.css diff --git a/packages/tree-select/index.pcss b/packages/tree-select/index.css similarity index 91% rename from packages/tree-select/index.pcss rename to packages/tree-select/index.css index 1a2e6702..99397d80 100644 --- a/packages/tree-select/index.pcss +++ b/packages/tree-select/index.css @@ -1,5 +1,5 @@ -@import '../common/style/var.pcss'; -@import '../common/style/ellipsis.pcss'; +@import '../common/style/var.css'; +@import '../common/style/ellipsis.css'; .tree-select { user-select: none; diff --git a/postcss.config.js b/postcss.config.js index f5a00bec..77528b22 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,8 +1,5 @@ module.exports = { plugins: { - 'postcss-easy-import': { - extensions: ['.wxss', '.css', '.pcss'] - }, 'precss': {}, 'postcss-calc': {}, 'autoprefixer': {} diff --git a/yarn.lock b/yarn.lock index 6929395b..1e5bb9f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4774,7 +4774,7 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -pify@^2.0.0, pify@^2.3.0: +pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -4915,19 +4915,6 @@ postcss-dir-pseudo-class@^3.0.0: postcss "^6.0.20" postcss-selector-parser "^3.1.1" -postcss-easy-import@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-easy-import/-/postcss-easy-import-3.0.0.tgz#8eaaf5ae59566083d0cae98735dfd803e3ab194d" - dependencies: - globby "^6.1.0" - is-glob "^4.0.0" - lodash "^4.17.4" - object-assign "^4.0.1" - pify "^3.0.0" - postcss "^6.0.11" - postcss-import "^10.0.0" - resolve "^1.1.7" - postcss-extend-rule@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/postcss-extend-rule/-/postcss-extend-rule-1.1.0.tgz#11e4d590ffe4253b853ef1fc03be7167da607d38" @@ -4953,16 +4940,6 @@ postcss-font-variant@^3.0.0: dependencies: postcss "^6.0.1" -postcss-import@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-10.0.0.tgz#4c85c97b099136cc5ea0240dc1dfdbfde4e2ebbe" - dependencies: - object-assign "^4.0.1" - postcss "^6.0.1" - postcss-value-parser "^3.2.3" - read-cache "^1.0.0" - resolve "^1.1.7" - postcss-initial@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-2.0.0.tgz#72715f7336e0bb79351d99ee65c4a253a8441ba4" @@ -5325,12 +5302,6 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-cache@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" - dependencies: - pify "^2.3.0" - read-pkg-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"