From f524d6ccd2b73f4c4a3281f37d4585971b094ffe Mon Sep 17 00:00:00 2001
From: cookfront <cookfront@gmail.com>
Date: Fri, 24 Feb 2017 17:46:56 +0800
Subject: [PATCH] zanui css build

---
 .gitignore                                    |  1 +
 build/bin/build-entry.js                      |  2 --
 build/webpack.build.js                        |  2 +-
 build/webpack.config.js                       |  4 ----
 docs/App.vue                                  |  2 ++
 docs/index.js                                 |  3 ++-
 package.json                                  |  5 +++--
 packages/dialog/src/dialog.vue                |  2 +-
 packages/zanui-css/README.md                  |  1 +
 packages/zanui-css/gulpfile.js                | 13 +++++++++++
 packages/zanui-css/package.json               | 22 ++++++++++++++-----
 packages/zanui-css/salad.config.json          | 16 ++++++++++++++
 .../zanui-css/src/{button.pcss => button.css} |  0
 .../{button_group.pcss => button_group.css}   |  0
 .../zanui-css/src/{cell.pcss => cell.css}     |  0
 .../zanui-css/src/{dialog.pcss => dialog.css} |  0
 .../zanui-css/src/{field.pcss => field.css}   |  0
 .../zanui-css/src/{icon.pcss => icon.css}     |  0
 packages/zanui-css/src/index.css              | 14 ++++++++++++
 packages/zanui-css/src/index.pcss             | 12 ----------
 .../src/{loading.pcss => loading.css}         |  0
 .../zanui-css/src/{picker.pcss => picker.css} |  0
 .../zanui-css/src/{popup.pcss => popup.css}   |  0
 .../zanui-css/src/{radio.pcss => radio.css}   |  0
 .../zanui-css/src/{switch.pcss => switch.css} |  0
 src/index.js                                  |  2 --
 26 files changed, 71 insertions(+), 30 deletions(-)
 create mode 100644 packages/zanui-css/gulpfile.js
 create mode 100644 packages/zanui-css/salad.config.json
 rename packages/zanui-css/src/{button.pcss => button.css} (100%)
 rename packages/zanui-css/src/{button_group.pcss => button_group.css} (100%)
 rename packages/zanui-css/src/{cell.pcss => cell.css} (100%)
 rename packages/zanui-css/src/{dialog.pcss => dialog.css} (100%)
 rename packages/zanui-css/src/{field.pcss => field.css} (100%)
 rename packages/zanui-css/src/{icon.pcss => icon.css} (100%)
 create mode 100644 packages/zanui-css/src/index.css
 delete mode 100644 packages/zanui-css/src/index.pcss
 rename packages/zanui-css/src/{loading.pcss => loading.css} (100%)
 rename packages/zanui-css/src/{picker.pcss => picker.css} (100%)
 rename packages/zanui-css/src/{popup.pcss => popup.css} (100%)
 rename packages/zanui-css/src/{radio.pcss => radio.css} (100%)
 rename packages/zanui-css/src/{switch.pcss => switch.css} (100%)

diff --git a/.gitignore b/.gitignore
index 5306c013b..4c1cab8de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ lib/*
 !lib/style.css
 node_modules
 example/dist
+dist
diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js
index d343a9195..d43620767 100644
--- a/build/bin/build-entry.js
+++ b/build/bin/build-entry.js
@@ -8,8 +8,6 @@ var OUTPUT_PATH = path.join(__dirname, '../../src/index.js');
 var IMPORT_TEMPLATE = 'import {{name}} from \'../packages/{{package}}/index.js\';';
 var ISNTALL_COMPONENT_TEMPLATE = '  Vue.component({{name}}.name, {{name}});';
 var MAIN_TEMPLATE = `{{include}}
-// zanui
-import '../packages/zanui-css/src/index.pcss';
 
 const install = function(Vue) {
   if (install.installed) return;
diff --git a/build/webpack.build.js b/build/webpack.build.js
index 4222eae61..6e900f7ba 100644
--- a/build/webpack.build.js
+++ b/build/webpack.build.js
@@ -6,7 +6,7 @@ config.entry = {
 
 config.output = {
   filename: './dist/[name].js',
-  library: 'Oxygen',
+  library: 'zanui',
   libraryTarget: 'umd'
 }
 
diff --git a/build/webpack.config.js b/build/webpack.config.js
index 5d28befbf..8841731d8 100644
--- a/build/webpack.config.js
+++ b/build/webpack.config.js
@@ -57,10 +57,6 @@ module.exports = {
       },
       {
         test: /\.css$/,
-        loader: 'style-loader!css-loader?root=./docs/'
-      },
-      {
-        test: /\.pcss$/,
         loader: 'style-loader!css-loader!postcss-loader'
       },
       {
diff --git a/docs/App.vue b/docs/App.vue
index c0b8380c3..648a9b356 100644
--- a/docs/App.vue
+++ b/docs/App.vue
@@ -21,6 +21,8 @@ export default {
 </script>
 
 <style lang="css">
+  @import './assets/docs.css';
+
   .page-container {
     width: 1140px;
     padding: 0 30px;
diff --git a/docs/index.js b/docs/index.js
index dfbaf47a3..932bd8878 100644
--- a/docs/index.js
+++ b/docs/index.js
@@ -1,4 +1,3 @@
-import './assets/docs.css';
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import App from './App';
@@ -7,6 +6,8 @@ import demoBlock from './components/demo-block';
 import SideNav from './components/side-nav';
 import Oxygen from '../src/index';
 
+import 'packages/zanui-css/src/index.css';
+
 Vue.use(Oxygen);
 Vue.use(VueRouter);
 Vue.component('demo-block', demoBlock);
diff --git a/package.json b/package.json
index f10b62000..993847cc6 100644
--- a/package.json
+++ b/package.json
@@ -11,9 +11,10 @@
   ],
   "scripts": {
     "bootstrap": "npm i --registry=http://registry.npm.qima-inc.com",
-    "build:file": "node build/bin/build-entry.js",
-    "build": "npm run clean && npm run lint && npm run build:file && npm run concat:dev && npm run concat:prod",
     "dev": "npm run bootstrap && npm run build:file",
+    "build:file": "node build/bin/build-entry.js",
+    "build:zanui-css": "gulp build --gulpfile packages/zanui-css/gulpfile.js",
+    "build": "npm run clean && npm run lint && npm run build:file && webpack --progress --hide-modules --config  build/webpack.build.min.js && webpack --progress --hide-modules --config  build/webpack.build.js",
     "builddocs": "webpack --progress --hide-modules --config  build/webpack.config.js && set NODE_ENV=production webpack --progress --hide-modules --config  build/webpack.config.js",
     "docs": "npm run dev && webpack-dev-server --inline --hot --config  build/webpack.config.js",
     "clean": "rimraf lib && rimraf packages/*/lib",
diff --git a/packages/dialog/src/dialog.vue b/packages/dialog/src/dialog.vue
index 5f6c48e72..45190f49a 100644
--- a/packages/dialog/src/dialog.vue
+++ b/packages/dialog/src/dialog.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import Popup from 'packages/popup';
+import Popup from 'src/mixins/popup';
 
 const CANCEL_TEXT = '取消';
 const CONFIRM_TEXT = '确认';
diff --git a/packages/zanui-css/README.md b/packages/zanui-css/README.md
index e69de29bb..3a3f333be 100644
--- a/packages/zanui-css/README.md
+++ b/packages/zanui-css/README.md
@@ -0,0 +1 @@
+# zanui-css
diff --git a/packages/zanui-css/gulpfile.js b/packages/zanui-css/gulpfile.js
new file mode 100644
index 000000000..5ddcc7ecf
--- /dev/null
+++ b/packages/zanui-css/gulpfile.js
@@ -0,0 +1,13 @@
+var gulp = require('gulp');
+var postcss = require('gulp-postcss');
+var cssmin = require('gulp-cssmin');
+var salad = require('postcss-salad')(require('./salad.config.json'));
+
+gulp.task('compile', function() {
+  return gulp.src('./src/*.css')
+    .pipe(postcss([salad]))
+    .pipe(cssmin())
+    .pipe(gulp.dest('./lib'));
+});
+
+gulp.task('build', ['compile']);
diff --git a/packages/zanui-css/package.json b/packages/zanui-css/package.json
index fcfe39214..2ea1b110c 100644
--- a/packages/zanui-css/package.json
+++ b/packages/zanui-css/package.json
@@ -1,10 +1,22 @@
 {
-  "name": "@youzan/zenui",
+  "name": "@youzan/zanui-css",
   "version": "0.0.1",
-  "description": "wap component style",
-  "main": "./lib/index.js",
-  "author": "niunai",
+  "description": "zanui css.",
+  "main": "lib/index.css",
+  "style": "lib/index.css",
+  "files": [
+    "lib",
+    "src"
+  ],
+  "scripts": {
+    "build": "gulp build"
+  },
   "license": "MIT",
-  "devDependencies": {},
+  "devDependencies": {
+    "gulp": "^3.9.1",
+    "gulp-cssmin": "^0.1.7",
+    "gulp-postcss": "^6.1.1",
+    "postcss-salad": "^1.0.5"
+  },
   "dependencies": {}
 }
diff --git a/packages/zanui-css/salad.config.json b/packages/zanui-css/salad.config.json
new file mode 100644
index 000000000..1d82ab8c3
--- /dev/null
+++ b/packages/zanui-css/salad.config.json
@@ -0,0 +1,16 @@
+{
+  "browsers": ["ie > 8", "last 2 versions"],
+  "features": {
+    "bem": {
+      "shortcuts": {
+        "component": "b",
+        "modifier": "m",
+        "descendent": "e"
+      },
+      "separators": {
+        "descendent": "__",
+        "modifier": "--"
+      }
+    }
+  }
+}
diff --git a/packages/zanui-css/src/button.pcss b/packages/zanui-css/src/button.css
similarity index 100%
rename from packages/zanui-css/src/button.pcss
rename to packages/zanui-css/src/button.css
diff --git a/packages/zanui-css/src/button_group.pcss b/packages/zanui-css/src/button_group.css
similarity index 100%
rename from packages/zanui-css/src/button_group.pcss
rename to packages/zanui-css/src/button_group.css
diff --git a/packages/zanui-css/src/cell.pcss b/packages/zanui-css/src/cell.css
similarity index 100%
rename from packages/zanui-css/src/cell.pcss
rename to packages/zanui-css/src/cell.css
diff --git a/packages/zanui-css/src/dialog.pcss b/packages/zanui-css/src/dialog.css
similarity index 100%
rename from packages/zanui-css/src/dialog.pcss
rename to packages/zanui-css/src/dialog.css
diff --git a/packages/zanui-css/src/field.pcss b/packages/zanui-css/src/field.css
similarity index 100%
rename from packages/zanui-css/src/field.pcss
rename to packages/zanui-css/src/field.css
diff --git a/packages/zanui-css/src/icon.pcss b/packages/zanui-css/src/icon.css
similarity index 100%
rename from packages/zanui-css/src/icon.pcss
rename to packages/zanui-css/src/icon.css
diff --git a/packages/zanui-css/src/index.css b/packages/zanui-css/src/index.css
new file mode 100644
index 000000000..50bad75d3
--- /dev/null
+++ b/packages/zanui-css/src/index.css
@@ -0,0 +1,14 @@
+/**
+  css组件库入口，组装成css组件库
+ */
+@import './button.css';
+@import './button_group.css';
+@import './cell.css';
+@import './dialog.css';
+@import './field.css';
+@import './icon.css';
+@import './loading.css';
+@import './picker.css';
+@import './popup.css';
+@import './radio.css';
+@import './switch.css';
diff --git a/packages/zanui-css/src/index.pcss b/packages/zanui-css/src/index.pcss
deleted file mode 100644
index afe503ef7..000000000
--- a/packages/zanui-css/src/index.pcss
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
-  css组件库入口，组装成css组件库
- */
-@import './button.pcss';
-@import './button_group.pcss';
-@import './cell.pcss';
-@import './dialog.pcss';
-@import './field.pcss';
-@import './icon.pcss';
-@import './popup.pcss';
-@import './picker.pcss';
-@import './switch.pcss';
diff --git a/packages/zanui-css/src/loading.pcss b/packages/zanui-css/src/loading.css
similarity index 100%
rename from packages/zanui-css/src/loading.pcss
rename to packages/zanui-css/src/loading.css
diff --git a/packages/zanui-css/src/picker.pcss b/packages/zanui-css/src/picker.css
similarity index 100%
rename from packages/zanui-css/src/picker.pcss
rename to packages/zanui-css/src/picker.css
diff --git a/packages/zanui-css/src/popup.pcss b/packages/zanui-css/src/popup.css
similarity index 100%
rename from packages/zanui-css/src/popup.pcss
rename to packages/zanui-css/src/popup.css
diff --git a/packages/zanui-css/src/radio.pcss b/packages/zanui-css/src/radio.css
similarity index 100%
rename from packages/zanui-css/src/radio.pcss
rename to packages/zanui-css/src/radio.css
diff --git a/packages/zanui-css/src/switch.pcss b/packages/zanui-css/src/switch.css
similarity index 100%
rename from packages/zanui-css/src/switch.pcss
rename to packages/zanui-css/src/switch.css
diff --git a/src/index.js b/src/index.js
index 444268129..d591aba7e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,8 +10,6 @@ import Dialog from '../packages/dialog/index.js';
 import Picker from '../packages/picker/index.js';
 import RadioGroup from '../packages/radio-group/index.js';
 import Loading from '../packages/loading/index.js';
-// zanui
-import '../packages/zanui-css/src/index.pcss';
 
 const install = function(Vue) {
   if (install.installed) return;