Skip to content

Commit dfa5500

Browse files
sakitam-fddsakitam-fdd
authored
Merge pull request #3 from sakitam-fdd/dev
releases 2.0
2 parents c3db20b + e96c283 commit dfa5500

File tree

127 files changed

+7170
-13005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+7170
-13005
lines changed

‎.babelrc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{
2-
"presets": ["es2015", "stage-2"],
3-
"plugins": ["babel-plugin-add-module-exports"],
2+
"presets": [
3+
["es2015", { "loose": true, "modules": false }],
4+
"stage-2"
5+
],
6+
"plugins": [
7+
"external-helpers",
8+
"syntax-dynamic-import"
9+
],
10+
"ignore": [
11+
"dist/*.js"
12+
],
413
"comments": false
5-
}
14+
}

‎.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
build/*.js
22
config/*.js
33
dist/*.js
4+
example/
5+
test/**/*.js

‎.eslintrc.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
1-
// http://eslint.org/docs/user-guide/configuring
2-
1+
// https://eslint.org/docs/user-guide/configuring
32
module.exports = {
43
root: true,
54
parser: 'babel-eslint',
65
parserOptions: {
76
sourceType: 'module'
87
},
98
env: {
10-
browser: true,
9+
browser: true
1110
},
12-
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
11+
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
1312
extends: 'standard',
1413
// required to lint *.vue files
1514
plugins: [
1615
],
1716
// add your custom rules here
1817
'rules': {
18+
// allow semi
19+
'semi': 0,
20+
// allow global require
21+
'global-require': 0,
1922
// allow paren-less arrow functions
2023
'arrow-parens': 0,
21-
'new-cap': 0,
2224
// allow async-await
2325
'generator-star-spacing': 0,
2426
// allow debugger during development
2527
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
26-
},
27-
'globals': {
28-
"ol": true
2928
}
3029
}

‎CONTRIBUTING.md renamed to ‎.github/CONTRIBUTING-CN.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
1-
# ol-extent贡献指南
1+
# ol-extent 贡献指南
22

33
## 版本
44

5-
| 主版本号 | 次版本号 | 修订号 |
5+
| 主版本号 | 次版本号 | 修订号 |
66
| ------------- | -------------------------- | -------------------- |
7-
| 破坏性变更 | 功能添加,无破坏性变更 | Bug修正,无破坏性变更 |
7+
| 破坏性变更 | 功能添加,无破坏性变更 | Bug修正,无破坏性变更 |
88

99
### 版本号递增规则如下：
1010

11-
- 主版本号：当你做了不兼容的 API 修改,
12-
- 次版本号：当你做了向下兼容的功能性新增,
13-
- 修订号：当你做了向下兼容的问题修正.
11+
- 主版本号：当你做了不兼容的 API 修改
12+
13+
- 次版本号：当你做了向下兼容的功能性新增
14+
15+
- 修订号：当你做了向下兼容的问题修正
1416

1517
## Issue 规范
1618

1719
- issue 仅用于提交 Bug 或 Feature 以及设计相关的内容，其它内容可能会被直接关闭。
1820

1921
- 在提交 issue 之前，请搜索相关内容是否已被提出。
2022

21-
- 请说明使用的HMap的版本号，并提供操作系统和浏览器信息。推荐使用 [JSFiddle](https://jsfiddle.net/) 或者[codepen](https://codepen.io/)生成在线 demo，这能够更直观地重现问题。
23+
- 请说明使用的 `openlayers`的版本号，并提供操作系统和浏览器信息。推荐使用 [JSFiddle](https://jsfiddle.net/) 或者[codepen](https://codepen.io/)生成在线 demo，这能够更直观地重现问题。
2224

2325
## Pull Request 规范
26+
2427
- 请先 fork 一份到自己的项目下，不要直接在仓库下建分支。
2528

2629
- commit 信息要以# [记录] + messages
@@ -29,7 +32,6 @@
2932

3033
- 执行 `npm run dev && npm run build` 后可以正确打包文件。
3134

32-
3335
- 提交 PR 前请 rebase，确保 commit 记录的整洁。
3436

3537
- 确保 PR 是提交到 `dev` 分支，而不是 `master` 分支。
@@ -39,10 +41,13 @@
3941

4042
## 开发环境搭建
4143

42-
首先你需要 Node.js 4+ 和 NPM 3+
44+
首先你需要 Node.js 7+ 和 NPM 5+
45+
4346
```shell
4447
git clone https://github.com/sakitam-fdd/ol-extent.git
45-
npm install
48+
npm install // or yarn
4649
npm run dev
4750
npm run build
51+
npm run karma.test
52+
npm run karma.cover
4853
```

‎.github/CONTRIBUTING.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# ol-extent Contribution Guide
2+
3+
## version
4+
5+
| Major version | minor version | Amendment No |
6+
| ------------- | -------------------------- | -------------------- |
7+
| Destructive changes | feature added without destructive changes | bug fixed |
8+
9+
### version number increment rules are as follows:
10+
11+
- Major Version Number: When you make incompatible API changes
12+
13+
- Minor Version Number: When you've made a downward compatibility feature added
14+
15+
- Revision Number: Fixed when you made a backwards compatible problem.
16+
17+
## Issue specification
18+
19+
- issue is used to submit bug or feature and design related content only, the rest may be closed directly.
20+
21+
- Before submitting an issue, search for relevant content has been submitted.
22+
23+
- Please provider the version number of ``openlayers`` used and provide operating system and browser information.
24+
It is recommended to use [JSFiddle](https://jsfiddle.net/) or [codepen](https://codepen.io/) to generate an online
25+
demo that reproduces the problem more intuitively.
26+
27+
## Pull Request specification
28+
29+
- Please fork one to their own projects, do not build branches directly under the warehouse.
30+
31+
- commit message to # [record] + messages.
32+
33+
- ** Do not submit files packaged in `dist` inside.
34+
35+
- Execute `npm run dev && npm run build` to correctly package the file.
36+
37+
- Please submit a PR before rebase, to ensure the integrity of the commit records.
38+
39+
- Make sure the PR is submitted to the `dev` branch, not the` master` branch.
40+
41+
- If the bug is fixed, please give a description in the PR.
42+
43+
44+
## Development environment
45+
46+
first you need Node.js 7+ and NPM 5+
47+
48+
```shell
49+
git clone https://github.com/sakitam-fdd/ol-extent.git
50+
npm install // or yarn
51+
npm run dev
52+
npm run build
53+
npm run karma.test
54+
npm run karma.cover
55+
```

‎.github/ISSUE_TEMPLATE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
One-line summary [问题简述]
2+
openlayers and ol-extent version [openlayers 和 ol-extent 版本]:
3+
Browser version [浏览器类型和版本]:
4+
OS Version [操作系统类型和版本]:
5+
Expected behaviour [期望结果]
6+
Other comments [其他信息]

‎.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
# Created by .ignore support plugin (hsz.mobi)
1+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
2+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
3+
# User-specific stuff:
24
.idea/
35
package-lock.json
46
node_modules/
5-
dist/
7+
coverage/
8+
dist/
9+
npm-debug.log*
10+
yarn-debug.log*
11+
yarn-error.log*

‎.npmignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,12 @@ config/
44
docs/
55
node_modules/
66
test/
7+
package-lock.json
78
.editorconfig
9+
.babelrc
10+
coverage/
11+
npm-debug.log*
12+
yarn-debug.log*
13+
yarn-error.log*
14+
.idea/
15+
yarn.lock

‎.postcssrc.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// https://github.com/michael-ciniawsky/postcss-load-config
2+
3+
module.exports = {
4+
"plugins": {
5+
"postcss-import": {},
6+
"postcss-url": {},
7+
// to edit target browsers: use "browserslist" field in package.json
8+
"autoprefixer": {}
9+
}
10+
};

‎.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ cache:
44
directories:
55
- node_modules
66
install: npm install
7+
addons:
8+
Chrome: "latest"
9+
before_script:
10+
- "export DISPLAY=:99.0"
11+
- "sh -e /etc/init.d/xvfb start"
12+
- sleep 3 # give xvfb some time to start
713
script:
8-
- npm run travisDev
914
- npm run build
15+
- npm run karma.test

0 commit comments

Comments
 (0)