Merge branch 'v2'

ljb1010 · Mar 5, 2019 · 2bf10a9 · 2bf10a9
2 parents 9b59199 + 908796c
commit 2bf10a9
Show file tree

Hide file tree

Showing 34 changed files with 693 additions and 110 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ sudo: required
 language: node_js
 node_js:
   - '8'
-cache: npm
 script:
   - npm test
   - npm run coveralls
diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -0,0 +1,61 @@
+# NutUI 2
+![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=master)](https://github.com/jdf2e/nutui/) [![Coverage Status](https://coveralls.io/repos/github/jdf2e/nutui/badge.svg?branch=master)](https://coveralls.io/github/jdf2e/nutui?branch=master) ![license](https://img.shields.io/npm/l/@nutui/nutui.svg)
+
+一套移动端轻量级Vue组件库
+
+![NutUI](https://img11.360buyimg.com/uba/jfs/t1/11117/21/3608/18942/5c20ab52E35e5a500/02e3c1f89cd3dad1.png)
+
+简体中文 | [English](./README.md)
+
+## 特性
+
+* 跨平台，自动转微信小程序组件（稍后上线，敬请期待）
+* 全新的架构
+* 30+ 京东移动端项目正在使用
+* 参照京东APP 7.0 视觉规范
+* 支持按需加载
+* 详尽的文档和示例
+* 支持定制主题
+* 支持多语言（国际化）
+* 支持 TypeScript
+* 支持服务端渲染（Vue SSR）
+* 单元测试加持
+* 配套有基于Webpack的构建工具，可快速创建已内置本组件库的Vue工程 
+
+> 如需使用 1.x 版本，安装时请指定版本号，如： `npm i @nutui/[email protected] -S`
+
+## 支持环境
+
+* Android 4.0+
+* iOS 8.0+
+* 支持 Vue 服务端渲染
+
+## 版本
+
+* 稳定版：[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
+
+> 你还可以订阅： https://github.com/jdf2e/nutui/releases.atom 来获得稳定版发布的通知。
+
+## 示例
+
+![NutUI Demo](https://img14.360buyimg.com/uba/jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
+
+## 安装使用
+
+具体安装使用方法请参考 NutUI 官网 
+
+https://nutui.jd.com
+
+文档：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
+
+## 链接
+* [意见反馈](https://github.com/jdf2e/nutui/issues)
+* [更新日志](https://github.com/jdf2e/nutui/releases)
+* [按需加载插件](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
+* [模板工程命令行工具(Gaea-cli)](https://github.com/jdf2e/Gaea4)
+* 联系我们：[email protected]
+
+
+## 开源协议
+
+本项目基于 **MIT** 协议
diff --git a/README.cn.md b/README.cn.md
@@ -0,0 +1,60 @@
+# NutUI 2
+![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=master)](https://github.com/jdf2e/nutui/) [![Coverage Status](https://coveralls.io/repos/github/jdf2e/nutui/badge.svg?branch=master)](https://coveralls.io/github/jdf2e/nutui?branch=master) ![license](https://img.shields.io/npm/l/@nutui/nutui.svg)
+
+A light mobile Toolkit based on Vue
+
+![NutUI](https://img11.360buyimg.com/uba/jfs/t1/11117/21/3608/18942/5c20ab52E35e5a500/02e3c1f89cd3dad1.png)
+
+
+## Features
+
+* Cross-platform，automatically convert to WeChat Mini Program components（coming soon）
+* New structure
+* Used by 30+ JD mobile projects
+* Refer to JD APP 7.0 visual specification
+* On-demand loading support
+* Detailed documents and examples
+* Customize themes support
+* Multiple languages support (Internationalization)
+* TypeScript support
+* Vue Server-side Rendering support（Vue SSR）
+* Unit test blessing
+* A Webpack-based build tool is available to quickly create a Vue project with this component library built in 
+
+> If you want to use the 1.x version, please specify the version number when installing，such as： `npm i @nutui/[email protected] -S`
+
+## Environment Support
+
+* Android 4.0+
+* iOS 8.0+
+* Support Vue Server-side Rendering
+
+## Version
+
+* Stable:[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
+
+> You can also subscribe to： https://github.com/jdf2e/nutui/releases.atom for the notifications of stable releases。
+
+## Examples
+
+![NutUI Demo](https://img14.360buyimg.com/uba/jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
+
+## Installation
+
+Please refer to the NutUI offcial website for the details on how to use it 
+
+https://nutui.jd.com
+
+Documents：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
+
+## Links
+* [Feedback](https://github.com/jdf2e/nutui/issues)
+* [Change Logs](https://github.com/jdf2e/nutui/releases)
+* [On-demand plugins](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
+* [Template project command line tool(Gaea-cli)](https://github.com/jdf2e/Gaea4)
+* Contact us：[email protected]
+
+
+## Open Source LICENSE
+
+Based on **MIT** LICENSE
diff --git a/README.md b/README.md
@@ -1,60 +1,61 @@
 # NutUI 2
 ![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=master)](https://github.com/jdf2e/nutui/) [![Coverage Status](https://coveralls.io/repos/github/jdf2e/nutui/badge.svg?branch=master)](https://coveralls.io/github/jdf2e/nutui?branch=master) ![license](https://img.shields.io/npm/l/@nutui/nutui.svg)
 
-一套移动端轻量级Vue组件库
+A light mobile Toolkit based on Vue
 
 ![NutUI](https://img11.360buyimg.com/uba/jfs/t1/11117/21/3608/18942/5c20ab52E35e5a500/02e3c1f89cd3dad1.png)
 
+English | [简体中文](./README-zh_CN.md)
 
-## 特性
+## Features
 
-* 跨平台，自动转微信小程序组件（稍后上线，敬请期待）
-* 全新的架构
-* 30+ 京东移动端项目正在使用
-* 参照京东APP 7.0 视觉规范
-* 支持按需加载
-* 详尽的文档和示例
-* 支持定制主题
-* 支持多语言（国际化）
-* 支持 TypeScript
-* 支持服务端渲染（Vue SSR）
-* 单元测试加持
-* 配套有基于Webpack的构建工具，可快速创建已内置本组件库的Vue工程 
+* Cross-platform，automatically convert to WeChat Mini Program components（coming soon）
+* New structure
+* Used by 30+ JD mobile projects
+* Refer to JD APP 7.0 visual specification
+* On-demand loading Support
+* Detailed documents and examples
+* Customize themes Support
+* Multiple languages Support (Internationalization)
+* TypeScript Support
+* Vue Server-side Rendering Support（Vue SSR）
+* Unit test blessing
+* A Webpack-based build tool is available to quickly create a Vue project with this component library built in 
 
-> 如需使用 1.x 版本，安装时请指定版本号，如： `npm i @nutui/[email protected] -S`
+> If you want to use the 1.x version, please specify the version number when installing，such as： `npm i @nutui/[email protected] -S`
 
-## 支持环境
+## Environment Support
 
 * Android 4.0+
 * iOS 8.0+
-* 支持 Vue 服务端渲染
+* Support Vue Server-side Rendering
 
-## 版本
+## Version
 
-* 稳定版：[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
+* Stable:[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
 
-> 你还可以订阅： https://github.com/jdf2e/nutui/releases.atom 来获得稳定版发布的通知。
+> You can also subscribe to： https://github.com/jdf2e/nutui/releases.atom for the notifications of stable releases。
 
-## 示例
+## Examples
 
-![NutUI Demo](https://img14.360buyimg.com/uba/s300x300_jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
+![NutUI Demo](https://img14.360buyimg.com/uba/jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
 
-## 安装使用
+## Installation
 
-具体安装使用方法请参考 NutUI 官网 
+Please refer to the NutUI offcial website for the details on how to use it 
 
 https://nutui.jd.com
 
-文档：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
+Documents：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
 
-## 链接
-* [意见反馈](https://github.com/jdf2e/nutui/issues)
-* [更新日志](https://github.com/jdf2e/nutui/releases)
-* [按需加载插件](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
-* [模板工程命令行工具(Gaea-cli)](https://github.com/jdf2e/Gaea4)
-* 联系我们：[email protected]
+## Links
+* [Feedback](https://github.com/jdf2e/nutui/issues)
+* [Change Logs](https://github.com/jdf2e/nutui/releases)
+* [On-demand plugins](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
+* [Template project command line tool(Gaea-cli)](https://github.com/jdf2e/Gaea4)
+* Contact us：[email protected]
 
 
-## 开源协议
+## Open Source LICENSE
 
-本项目基于 **MIT** 协议
+Based on **MIT** LICENSE
diff --git a/build/webpack.doc.base.conf.js b/build/webpack.doc.base.conf.js
@@ -28,15 +28,17 @@ module.exports = merge(webpackBaseConf, {
             output:'./sites/doc/view/',
             template:'./doc-site/template.html',
             nav:'left',
-            needCode:true
+            needCode:true,
+            isbuild:isDev,
+            hasMarkList:false
         }),
         new mdtohtml({
             entry:'./docs',
             output:'./sites/doc/page/',
             template:'./doc-site/template.html',
             nav:'left',
-            needCode:false
-
+            needCode:false,
+            isbuild:isDev           
         }),
         new HtmlWebpackPlugin({
             template: './sites/doc/index.html',

diff --git a/build/webpack.doc.build.conf.js b/build/webpack.doc.build.conf.js
@@ -37,4 +37,5 @@ module.exports = merge(baseConf, {
             new OptimizeCSSAssetsPlugin({})
         ]
     },
-});
+});
+
diff --git a/docs/intro.md b/docs/intro.md
@@ -26,6 +26,10 @@ NutUI是一套京东风格的移动端Vue组件库，开发和服务于移动Web
 * 单元测试加持
 * 配套有基于Webpack的构建工具，可快速创建已内置本组件库的Vue工程
 
+## 示例
+
+![NutUI Demo](https://img14.360buyimg.com/uba/s260x260_jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
+
 ## 支持环境
 
 * Android 4.0+

diff --git a/package.json b/package.json
@@ -46,7 +46,8 @@
   "license": "MIT",
   "dependencies": {
     "@babel/polyfill": "7.0.0",
-    "@babel/runtime": "7.1.2"
+    "@babel/runtime": "7.1.2",
+    "intersection-observer": "^0.5.1"
   },
   "peerDependencies": {
     "vue": "2.5.17"
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,5 @@ module.exports = merge(baseConf, { @@
                 new OptimizeCSSAssetsPlugin({})
             ]
         },
-    });
+    });