Merge pull request #32 from QingWei-Li/master

Update package.json scripts, fixed #30

package.json

@@ -9,9 +9,9 @@
   ],
   "scripts": {
     "dev": "npm i && (node bin/iconInit.js & node bin/build-entry.js) && cooking watch -c scripts/cooking.demo.js",
-    "dist": "rm -rf lib && cooking build -c scripts/cooking.conf.js -p && cooking build -c scripts/cooking.component.js -p && npm run build:theme",
+    "dist": "del -f lib && cooking build -c scripts/cooking.conf.js -p && cooking build -c scripts/cooking.component.js -p && npm run build:theme",
     "dist:all": "node bin/build-all.js && npm run build:theme",
-    "build:theme": "node_modules/.bin/gulp build --gulpfile packages/theme-default/gulpfile.js && cp -rf packages/theme-default/lib lib/theme-default",
+    "build:theme": "gulp build --gulpfile packages/theme-default/gulpfile.js && cp-cli packages/theme-default/lib lib/theme-default",
     "deploy": "cooking build -c scripts/cooking.demo.js -p",
     "gh-docs": "cooking build -c scripts/cooking.demo.js -p && gh-pages -d examples/element-ui --remote origin",
     "postinstall": "lerna bootstrap",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "babel-core": "^6.14.0",
-    "babel-helper-vue-jsx-merge-props": "^1.0.1",
+    "babel-helper-vue-jsx-merge-props": "^2.0.0",
     "babel-loader": "^6.2.5",
     "babel-plugin-syntax-jsx": "^6.8.0",
     "babel-plugin-transform-vue-jsx": "^3.1.0",
@@ -41,7 +41,9 @@
     "cooking": "^1.0.0-rc.2",
     "cooking-lint": "^0.1.2",
     "cooking-vue2": "^0.1.4",
+    "cp-cli": "^1.0.2",
     "css-loader": "^0.24.0",
+    "del-cli": "^0.2.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
     "file-save": "^0.2.0",
@@ -52,6 +54,7 @@
     "html-webpack-plugin": "^2.22.0",
     "json-loader": "^0.5.4",
     "json-templater": "^1.0.4",
+    "kanpai": "^0.7.0",
     "lerna": "2.0.0-beta.18",
     "markdown-it": "^6.1.1",
     "markdown-it-container": "^2.0.0",

packages/badge/src/main.vue

@@ -4,7 +4,8 @@
     <sup
       v-text="content"
       class="el-badge__content"
-      :class="{ 'is-fixed': $slots.default, 'is-dot': isDot }" />
+      :class="{ 'is-fixed': $slots.default, 'is-dot': isDot }">
+    </sup>
   </div>
 </template>