Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@
"chrome": true
},
"plugins": ["html", "json"],
"extends": "elemefe",
"extends": "eslint:recommended",
"rules": {
"no-restricted-globals": ["error", "event", "fdescribe"]
"no-restricted-globals": ["error", "event", "fdescribe"],
"no-unused-vars": ["error", { "argsIgnorePattern": "^_" }]
},
"parserOptions": {
"ecmaVersion": 6,
"ecmaVersion": 2020,
"ecmaFeatures": {
"jsx": true
}
},
"env": {
"browser": true,
"node": true,
"es6": true
}
}
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ npm run dist
- 组件内如果依赖了其他组件,需要在当前组件内引入,参考 `Select`

## 代码规范
遵循饿了么前端的 [ESLint](https://github.com/ElemeFE/eslint-config-elemefe) 即可
遵循 [ESLint](https://github.com/ElemeFE/eslint-config-elemefe) 即可
92 changes: 91 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,94 @@ coverage
waiter.config.js
build/bin/algolia-key.js
.envrc
.history/
.history/

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

# Dependency directories
node_modules/
jspm_packages/

# Build output
dist/
build/
out/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local

# parcel-bundler cache
.cache
.parcel-cache

# Next.js build output
.next
out

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
public

# Storybook build outputs
.out
.storybook-out

# Temporary folders
tmp/
temp/

# Editor directories and files
.idea/
.vscode/
*.swp
*.swo
*.sublime-workspace
*.sublime-project

# OS generated files
Thumbs.db
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
25 changes: 9 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<p align="center">
<img src="https://cdn.rawgit.com/ElemeFE/element/dev/element_logo.svg">
<img src="https://raw.githubusercontent.com/ElemeFE/element/dev/element_logo.svg">
</p>

<p align="center">
<a href="https://travis-ci.org/ElemeFE/element">
<img src="https://travis-ci.org/ElemeFE/element.svg?branch=master">
</a>
<a href="https://coveralls.io/github/ElemeFE/element?branch=master">
<img src="https://coveralls.io/repos/github/ElemeFE/element/badge.svg?branch=master">
</a>
Expand All @@ -25,12 +22,8 @@
<a href="http://img.badgesize.io/https://unpkg.com/element-ui/lib/theme-chalk/index.css?compression=gzip&label=gzip%20size:%20CSS">
<img src="http://img.badgesize.io/https://unpkg.com/element-ui/lib/theme-chalk/index.css?compression=gzip&label=gzip%20size:%20CSS">
</a>
<a href="#backers">
<img src="https://opencollective.com/element/backers/badge.svg">
</a>
<a href="#sponsors">
<img src="https://opencollective.com/element/sponsors/badge.svg">
</a>
<img src="https://opencollective.com/element/backers/badge.svg">
<img src="https://opencollective.com/element/sponsors/badge.svg">
<a href="LICENSE">
<img src="https://img.shields.io/badge/License-MIT-yellow.svg">
</a>
Expand All @@ -46,14 +39,14 @@ For MiniProgram development, we recommend using [MorJS](https://github.com/eleme

## Links
- Homepage and documentation
- [International users](http://element.eleme.io/#/en-US)
- [Chinese users](http://element.eleme.io/#/zh-CN)
- [Spanish users](http://element.eleme.io/#/es)
- [French users](http://element.eleme.io/#/fr-FR)
- [International users](https://element.eleme.cn/#/en-US)
- [Chinese users](https://element.eleme.cn/#/zh-CN)
- [Spanish users](https://element.eleme.cn/#/es)
- [French users](https://element.eleme.cn/#/fr-FR)
- [awesome-element](https://github.com/ElementUI/awesome-element)
- [FAQ](./FAQ.md)
- [Vue.js 3.0 migration](https://github.com/element-plus/element-plus)
- [Customize theme](http://element.eleme.io/#/en-US/component/custom-theme)
- [Customize theme](https://element.eleme.cn/#/en-US/component/custom-theme)
- [Preview and generate theme online](https://elementui.github.io/theme-chalk-preview)
- [Element for React](https://github.com/elemefe/element-react)
- [Element for Angular](https://github.com/ElemeFE/element-angular)
Expand Down Expand Up @@ -89,7 +82,7 @@ import {
Vue.component(Select.name, Select)
Vue.component(Button.name, Button)
```
For more information, please refer to [Quick Start](http://element.eleme.io/#/en-US/component/quickstart) in our documentation.
For more information, please refer to [Quick Start](https://element.eleme.cn/#/en-US/component/quickstart) in our documentation.

## Browser Support
Modern browsers and Internet Explorer 10+.
Expand Down
19 changes: 10 additions & 9 deletions build/webpack.demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin');
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const launchEditorMiddleware = require('launch-editor-middleware');
const ESLintPlugin = require('eslint-webpack-plugin');

const config = require('./config');

Expand Down Expand Up @@ -53,12 +54,6 @@ const webpackConfig = {
},
module: {
rules: [
{
enforce: 'pre',
test: /\.(vue|jsx?)$/,
exclude: /node_modules/,
loader: 'eslint-loader'
},
{
test: /\.(jsx?|babel|es6)$/,
include: process.cwd(),
Expand Down Expand Up @@ -116,9 +111,15 @@ const webpackConfig = {
filename: './index.html',
favicon: './examples/favicon.ico'
}),
new CopyWebpackPlugin([
{ from: 'examples/versions.json' }
]),
new ESLintPlugin({
extensions: ['js', 'vue', 'jsx'],
exclude: 'node_modules'
}),
new CopyWebpackPlugin({
patterns: [
{ from: 'examples/versions.json' }
]
}),
new ProgressBarPlugin(),
new VueLoaderPlugin(),
new webpack.DefinePlugin({
Expand Down
10 changes: 6 additions & 4 deletions build/webpack.extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ demoConfig.output = {
filename: '[name].js'
};
demoConfig.plugins = [
new CopyWebpackPlugin([
{ from: 'examples/extension/src/manifest.json' },
{ from: 'examples/extension/src/icon.png' }
]),
new CopyWebpackPlugin({
patterns: [
{ from: 'examples/extension/src/manifest.json' },
{ from: 'examples/extension/src/icon.png' }
]
}),
new VueLoaderPlugin(),
new ProgressBarPlugin(),
new webpack.LoaderOptionsPlugin({
Expand Down
Loading