Skip to content

Commit ead8bf7

Browse files
authored
Merge pull request #4 from sakitam-fdd/dev
Fuck GFW
2 parents dfa5500 + 0469056 commit ead8bf7

17 files changed

+169
-309
lines changed

.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,5 @@ 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
137
script:
148
- npm run build
15-
- npm run karma.test

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.1 (2018.3.25)
2+
3+
* test GeoFence
4+
15
## 2.0.0 (2018.3.14)
26

37
* break change.

README-CN.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
> openlayers扩展插件, 当前版本已经经过重构,变化较大,你需要查看相关示例或者文档。
44
55
[![Build Status](https://travis-ci.org/sakitam-fdd/ol-extent.svg?branch=master)](https://www.travis-ci.org/sakitam-fdd/ol-extent)
6-
[![codecov](https://codecov.io/gh/sakitam-fdd/ol-extent/branch/master/graph/badge.svg)](https://codecov.io/gh/sakitam-fdd/ol-extent)
76
![JS gzip size](http://img.badgesize.io/https://unpkg.com/ol-extent/dist/ol-extent.js?compression=gzip&label=gzip%20size:%20JS)
87
[![Npm package](https://img.shields.io/npm/v/ol-extent.svg)](https://www.npmjs.org/package/ol-extent)
98
[![GitHub stars](https://img.shields.io/github/stars/sakitam-fdd/ol-extent.svg)](https://github.com/sakitam-fdd/ol-extent/stargazers)

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
You have to look at the examples or look at the relevant documents.
55

66
[![Build Status](https://travis-ci.org/sakitam-fdd/ol-extent.svg?branch=master)](https://www.travis-ci.org/sakitam-fdd/ol-extent)
7-
[![codecov](https://codecov.io/gh/sakitam-fdd/ol-extent/branch/master/graph/badge.svg)](https://codecov.io/gh/sakitam-fdd/ol-extent)
87
![JS gzip size](http://img.badgesize.io/https://unpkg.com/ol-extent/dist/ol-extent.js?compression=gzip&label=gzip%20size:%20JS)
98
[![Npm package](https://img.shields.io/npm/v/ol-extent.svg)](https://www.npmjs.org/package/ol-extent)
109
[![GitHub stars](https://img.shields.io/github/stars/sakitam-fdd/ol-extent.svg)](https://github.com/sakitam-fdd/ol-extent/stargazers)

build/helper.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@ const checkFolderExist = (path, mkdir) => {
6565
return true
6666
}
6767
};
68-
const cssPlugins = scss({
69-
output: resolve(_package.style),
70-
processor: css => postcss([autoprefixer, cssnano])
71-
.process(css)
72-
.then(result => result.css)
73-
});
68+
const cssPlugins = function (type) {
69+
return scss({
70+
output: !!type ? resolve(handleMinEsm(_package.style)) : resolve(_package.style),
71+
processor: css => postcss([autoprefixer, cssnano])
72+
.process(css)
73+
.then(result => result.css)
74+
})
75+
};
7476

7577
module.exports = {
7678
_package,
@@ -79,5 +81,6 @@ module.exports = {
7981
logError,
8082
blueString,
8183
cssPlugins,
82-
handleMinEsm
84+
handleMinEsm,
85+
checkFolderExist
8386
};

build/karma.base.config.js

Lines changed: 0 additions & 76 deletions
This file was deleted.

build/karma.cover.config.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

build/karma.tdd.config.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

build/karma.test.config.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

build/rollup-base-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const time = new Date();
1414
const year = time.getFullYear();
1515
const banner = `/*!\n * author: ${_package.author}
1616
* ${_package.name} v${_package.version}
17-
* build-time: ${year}-${time.getMonth()}-${time.getDay()} ${time.getHours()}:${time.getMinutes()}
17+
* build-time: ${year}-${time.getMonth() + 1}-${time.getDate()} ${time.getHours()}:${time.getMinutes()}
1818
* LICENSE: ${_package.license}
1919
* (c) 2017-${year} ${_package.homepage}\n */`;
2020
const genConfig = (opts) => {

0 commit comments

Comments
 (0)