v2.0.0-beta.2

Author: lifeifan

.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-ci
+repo_token: bOzghLfr6hi9xqh8LDKUPB07Q56vdl1YG

.travis.yml

@@ -2,8 +2,7 @@ sudo: required
 language: node_js
 node_js:
   - '8'
+cache: npm
 script:
-  - 'npm run test'
-before_script:
-  - 'sudo chown root /opt/google/chrome/chrome-sandbox'
-  - 'sudo chmod 4755 /opt/google/chrome/chrome-sandbox'
+  - npm test
+  - npm run coveralls

README.md

@@ -1,5 +1,5 @@
 # NutUI 2
-![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=v2)](https://github.com/jdf2e/nutui/)
+![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=v2)](https://github.com/jdf2e/nutui/) [![Coverage Status](https://coveralls.io/repos/github/jdf2e/nutui/badge.svg?branch=v2)](https://coveralls.io/github/jdf2e/nutui?branch=v2) ![license](https://img.shields.io/npm/l/@nutui/nutui.svg)
 
 一套移动端轻量级Vue组件库
 
@@ -17,9 +17,9 @@
 * 支持多语言（国际化）
 * 支持 TypeScript
 * 支持服务端渲染（Vue SSR）
-* 配套有基于Webpack的构建工具，可快速创建已内置本组件库的Vue工程
+* 配套有基于Webpack的构建工具，可快速创建已内置本组件库的Vue工程 
 
-> 如需使用 1.x 版本，请指定版本号，如：  `npm i @nutui/[email protected] -S`
+> 如需使用 1.x 版本，安装时请指定版本号，如：  `npm i @nutui/[email protected] -S`
 
 ## 支持环境
 
@@ -33,9 +33,17 @@
 
 > 你还可以订阅： https://github.com/jdf2e/nutui/releases.atom 来获得稳定版发布的通知。
 
+## 示例
+
+![npm version](http://img13.360buyimg.com/uba/s300x300_jfs/t1/14144/37/3433/5890/5c26d976E7cd98b80/94583409233081cc.jpg)
+
 ## 安装使用
 
-具体安装使用方法请参考 NutUI 官网 http://nutui.jd.com
+具体安装使用方法请参考 NutUI 官网 
+
+http://nutui.jd.com
+
+文档：[2.X](http://nutui.jd.com/default.html#/start) | [1.X](http://nutui.jd.com/1x/index.html#/intro)
 
 ## 链接
 * [意见反馈](https://github.com/jdf2e/nutui/issues)

build/webpack.demo.build.conf.js

@@ -1,6 +1,8 @@
 const webpack = require('webpack');
 const baseConf = require('./webpack.demo.base.conf.js');
 const merge = require('webpack-merge');
+const path = require('path');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const rimraf = require('rimraf');
@@ -21,7 +23,10 @@ module.exports = merge(baseConf, {
             'process.env': {
                 NODE_ENV: '"production"'
             }
-        })
+        }),
+        new CopyWebpackPlugin([
+            { from: path.join(__dirname, "../sites/demo/asset/img/favicon.ico"), to: path.join(__dirname, "../dist/sites/")}
+        ]),
     ],
     optimization: {
         minimizer: [

build/webpack.disperse.conf.js

@@ -1,5 +1,4 @@
 const webpack = require('webpack');
-const config = require('../package.json');
 const cptConf = require('../src/config.json');
 const webpackBaseConf = require('./webpack.base.conf.js');
 const path = require('path');

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nutui/nutui",
-  "version": "2.0.0-beta.1",
-  "description": "一套移动端轻量级Vue组件库",
+  "version": "2.0.0-beta.2",
+  "description": "一套轻量级移动端Vue组件库",
   "typings": "dist/types/index.d.ts",
   "main": "dist/nutui.js",
   "files": [
@@ -24,8 +24,8 @@
     "build": "npm run build:prod && npm run build:prodmin && npm run build:disp",
     "eslint": "eslint src/packages/**/*.{js,vue}",
     "add": "node scripts/createCptTpl.js",
-    "test": "cross-env NODE_ENV=test  mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js src/packages/*/__test__/**.spec.js",
-    "cover": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text npm run test",
+    "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text  mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js src/packages/*/__test__/**.spec.js",
+    "coveralls": "cat ./coverage/lcov.info | coveralls",
     "test:watch": "npm run test --watch"
   },
   "repository": {
@@ -63,6 +63,7 @@
     "@babel/core": "7.1.2",
     "@babel/plugin-syntax-dynamic-import": "7.0.0",
     "@babel/plugin-transform-runtime": "7.1.0",
+    "istanbul-instrumenter-loader": "^3.0.1",
     "@babel/preset-env": "7.1.0",
     "@nutui/carefree": "^0.4.0",
     "@tweenjs/tween.js": "17.2.0",
@@ -82,6 +83,7 @@
     "chalk": "2.4.1",
     "copy": "0.3.2",
     "copy-webpack-plugin": "4.5.4",
+    "coveralls": "^3.0.2",
     "cross-env": "5.2.0",
     "css-loader": "1.0.0",
     "eslint": "4.19.1",

scripts/md-to-other.js

@@ -98,7 +98,12 @@ function createdFile(output, sorce,ishasCode) {
           <div v-html="content"></div>
         </div>`+ res + '</div></template>' + jsroot;
         var buf = new Buffer(bufs);
-        fs.writeSync(fd, buf, 0, buf.length, 0);
+        if( typeof fd  == 'number'){
+            fs.writeSync(fd, buf, 0, buf.length, 0);
+         }else{
+             console.log(pathSrc,' typeof fd ！= number 请改正文件')
+         }
+       
     })
 }
 function fileDisplay(filePath,outPath,nohead) {

sites/demo/app.js

@@ -4,7 +4,6 @@ import "core-js/modules/es6.array.iterator";
 import Vue from 'vue';
 import App from './App.vue';
 import router from './router';
-import Conf from '../../src/config.json';
 import NutUI from '../../src/nutui';
 // import en from '../../src/locales/lang/en-US';
 // import demoEN from './lang/en-US';
@@ -50,7 +49,7 @@ const app = new Vue({
   template: '<App/>'
 })
 
-Vue.prototype.NUTCONF = Conf;
+//Vue.prototype.NUTCONF = Conf;
 
 
 let pageLoading = app.$toast.loading();

sites/demo/asset/img/favicon.ico

@@ -4,6 +4,7 @@
 <head>
   <meta charset="utf-8" />
   <meta content="telephone=no" name="format-detection" />
+  <link rel="shortcut icon" href="/favicon.ico">
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
   <title>NutUI - 移动端Vue组件库</title>
   <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script>

sites/demo/index.html

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import Conf from '../../src/config.json';
+import { packages } from '../../src/config.json';
 import vueg from 'vueg';
 import 'vueg/css/transition-min.css';
 
@@ -30,7 +30,7 @@ const routes = [
 ];
 
 //组件示例页面
-Conf.packages.map(item => {
+packages.map(item => {
   if (item.showDemo === false) return;
   const pkgName =  item.name.toLowerCase();
   routes.push({

sites/demo/router.js

@@ -4,17 +4,17 @@
     <div class="version">NutUI 2.0</div>
     <p>NutUI 是一套轻量级移动端Vue组件库。</p>
     <div
-      :class="['demo-list-box',{'unfold':foldStatus[sortIdx]}]"
-      v-for="(sortName,sortIdx) in sorts"
-      :key="sortIdx"
+      :class="['demo-list-box',{'unfold':foldStatus[item]}]"
+      v-for="item in sorts"
+      :key="item"
     >
-      <h4 @click="toggleFold(sortIdx)">
-        {{sortName}}
+      <h4 @click="toggleFold(item)">
+        {{oriSorts[item]}}
         <i></i>
       </h4>
       <ul>
         <template v-for="cpt in packages">
-          <li v-if="cpt.showDemo !== false && cpt.sort == sortIdx" :key="cpt.name">
+          <li v-if="cpt.showDemo !== false && cpt.sort == item" :key="cpt.name">
             <a :href="'./demo.html#/'+cpt.name">
               {{cpt.name}}
               <span>{{cpt.chnName}}</span>
@@ -27,17 +27,17 @@
 </template>
 
 <script>
-import Conf from "../../../src/config.json";
+import { packages,sorts } from "../../../src/config.json";
 export default {
   name: "index",
   data() {
     return {
       path: "",
       packages: {},
       sortedPackages: [],
-      sorts: [],
-      foldStatus: [],
-      version: ""
+      oriSorts:[],
+      sorts: [1,2,0,3,4,5],
+      foldStatus: []
     };
   },
   methods: {
@@ -47,18 +47,8 @@ export default {
     }
   },
   created() {
-    this.packages = Conf.packages;
-    this.version = Conf.version;
-    //this.sorts = Conf.sorts;
-
-    this.sorts = [
-      "数据录入",
-      "操作反馈",
-      "数据展示",
-      "导航组件",
-      "布局组件",
-      "基础组件"
-    ];
+    this.packages = packages;
+    this.oriSorts = sorts;
     
     this.foldStatus = Array(this.sorts.length)
       .join(",")

sites/demo/view/index.vue

@@ -21,7 +21,6 @@ import 'highlight.js/styles/github.css';
 //import prettify from 'google-code-prettify/src/prettify';
 //import  'google-code-prettify/src/prettify.css';
 //import  'google-code-prettify/styles/sunburst.css';
-import Conf from '../../src/config.json';
  //import qrcode from './qrcode/index.js';
 import codes from 'qrcode';
  //import NutUI from '../../src/nutui.js';
@@ -37,6 +36,7 @@ new Vue({
   router,
   components: { App },
   template: '<App/>'
-})
-Vue.prototype.NUTCONF = Conf;
+});
+
+//Vue.prototype.NUTCONF = Conf;