Merge pull request #2 from ElemeFE/dev

merge
kolesoffac · May 10, 2018 · c0b6948 · c0b6948
2 parents 2d8e73b + 68db03f
commit c0b6948
Show file tree

Hide file tree

Showing 374 changed files with 29,450 additions and 3,887 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,6 +1,9 @@
 src/utils/popper.js
 src/utils/date.js
+examples/play
 *.sh
 node_modules
 lib
 coverage
+*.md
+*.scss
diff --git a/.eslintrc b/.eslintrc
@@ -6,8 +6,11 @@
     "expect": true,
     "sinon": true
   },
-  "plugins": ['vue','json'],
-  "extends": 'elemefe',
+  "plugins": ["html", "json"],
+  "extends": "elemefe",
+  "rules": {
+    "no-restricted-globals": ["error", "event", "fdescribe"]
+  },
   "parserOptions": {
     "ecmaFeatures": {
       "experimentalObjectRestSpread": true,

diff --git a/.github/CONTRIBUTING.en-US.md b/.github/CONTRIBUTING.en-US.md
@@ -35,24 +35,14 @@ We are excited that you are interested in contributing to Element. Before submit
 - Merging a PR takes two maintainers: one approves the changes after reviewing, and then the other reviews and merges.
 
 ## Prerequisites
-`Node.js 4+` and `NPM 3+` are required.
+`Node.js 4+`, `yarn` and `npm 3+` are required. Note: we use yarn to lock dependency versions, so you should install dependencies using `yarn` instead of `npm install`.
 ```shell
 git clone git@github.com:ElemeFE/element.git
 npm run dev
 
 # open http://localhost:8085
 ```
 
-For Chinese users, [yarn](https://github.com/yarnpkg/yarn) with taobao registry is recommended if the dependency installation is slow.
-```shell
-npm i yarn -g
-yarn config set registry https://registry.npm.taobao.org
-yarn
-npm run dev
-
-# open http://localhost:8085
-```
-
 To build:
 
 ```shell

diff --git a/.github/CONTRIBUTING.es.md b/.github/CONTRIBUTING.es.md
@@ -38,7 +38,7 @@ Estamos orgullosos de que usted esta interesado en contribuir al proyecto `Eleme
 
 
 ## Requerimientos Técnicos 
-`Node.js 4+` y `NPM 3+` son requisitos
+`Node.js 4+`, `yarn` y `npm 3+` son requisitos. Nota: Usamos yarn para bloquear versiones de dependencias, por lo que debería instalar dependencias usando `yarn` en lugar de `npm install`.
 .
 ```shell
 git clone git@github.com:ElemeFE/element.git
@@ -47,17 +47,6 @@ npm run dev
 # abra http://localhost:8085
 ```
 
-Para usuarios chinos, [yarn](https://github.com/yarnpkg/yarn) con `taobao registry` es recomendado, sí la instalación de dependencias es lenta.
-
-```shell
-npm i yarn -g
-yarn config set registry https://registry.npm.taobao.org
-yarn
-npm run dev
-
-# abra http://localhost:8085
-```
-
 Para armar:
 
 ```

diff --git a/.github/CONTRIBUTING.zh-CN.md b/.github/CONTRIBUTING.zh-CN.md
@@ -33,25 +33,15 @@ Element UI 的成长离不开大家的支持，如果你愿意为 Element UI 贡
 - 合并代码需要两名维护人员参与：一人进行 review 后 approve，另一人再次 review，通过后即可合并。
 
 ## 开发环境搭建
-首先你需要 Node.js 4+ 和 NPM 3+
+首先你需要 Node.js 4+，yarn 和 npm 3+。注意：我们使用 yarn 进行依赖版本的锁定，所以请不要使用 `npm install` 安装依赖。
 ```shell
 git clone git@github.com:ElemeFE/element.git
 npm run dev
 
 # open http://localhost:8085
 ```
 
-如果国内用户觉得安装慢可以使用 [yarn](https://github.com/yarnpkg/yarn) 搭配 taobao registry
-```shell
-npm i yarn -g
-yarn config set registry https://registry.npm.taobao.org
-yarn
-npm run dev
-
-# open http://localhost:8085
-```
-
-To build:
+打包代码：
 
 ```shell
 npm run dist

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,12 @@
 <!--
+重要: 请使用以下链接创建新 issue
+
+  https://elementui.github.io/issue-generator
+
+未通过以上链接创建的 issue 会被机器人直接关闭。
+
+########
+
 IMPORTANT: Please use the following link to create a new issue:
 
   https://elementui.github.io/issue-generator

diff --git a/.gitignore b/.gitignore
@@ -6,9 +6,11 @@ npm-debug.log.*
 lerna-debug.log.*
 lib
 .idea
+.vscode
 examples/element-ui
 examples/pages/en-US
 examples/pages/zh-CN
+examples/pages/es
 fe.element/element-ui
 .npmrc
 coverage

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: false
 language: node_js
-node_js: stable
+node_js: lts/*
 before_install:
 - export CHROME_BIN=chromium-browser
 - export DISPLAY=:99.0