Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump lodash.merge from 4.6.1 to 4.6.2 #4

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Bump lodash.merge from 4.6.1 to 4.6.2 #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a18171b
first commit
Aug 11, 2016
d5b3c95
rm dependencies
Aug 11, 2016
de9ee4b
add zero-width-space
Aug 11, 2016
b4de38b
add .travis.yml
Aug 11, 2016
6172d3b
add travis ico
Aug 11, 2016
67ee514
unique
Aug 11, 2016
b28b423
add babel-preset-es2015
Aug 13, 2016
de81926
add Dependency Status
Aug 13, 2016
cd14b6f
update link
Aug 16, 2016
f7085a1
1.0.5
Aug 16, 2016
6b61a5d
add ci node version
Aug 16, 2016
7c264a7
1.0.6
Aug 24, 2016
d4df4ae
update devDependencies
Sep 28, 2016
15f165b
update travis
haozi Dec 12, 2016
eaf676a
happy new year
haozi Jan 11, 2017
dd96d29
update
haozi Feb 3, 2017
a9411ff
add es module
Apr 17, 2017
5e392f5
happy new year
haozi Jan 15, 2018
c7d6c71
update
haozi Feb 1, 2018
dd7557e
add: 新增零宽字符 \u202D
Jan 18, 2019
ae4f2e9
update package.json
Feb 26, 2019
6116fd8
update travis
Feb 27, 2019
3cccb86
happy new year
dependabot[bot] Oct 9, 2020
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
Prev Previous commit
Next Next commit
update devDependencies
  • Loading branch information
@haozi
haozime authored and haozi committed Oct 9, 2020
commit d4df4ae598883979d4d6602c6683c973b2fb4058
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# safe-trim
---

[![Build Status](https://travis-ci.org/haozime/safe-trim.svg?branch=master)](https://travis-ci.org/haozime/safe-trim/branches)
[![Build Status](https://travis-ci.org/haozime/safe-trim.svg?branch=1.0.7)](https://travis-ci.org/haozime/safe-trim/branches)
[![codecov](https://codecov.io/gh/haozime/safe-trim/branch/master/graph/badge.svg)](https://codecov.io/gh/haozime/safe-trim)
[![dependencies Status](https://david-dm.org/haozime/safe-trim/status.svg)](https://david-dm.org/haozime/safe-trim)
[![devDependencies Status](https://david-dm.org/haozime/safe-trim/dev-status.svg)](https://david-dm.org/haozime/safe-trim?type=dev)
Expand Down
8 changes: 4 additions & 4 deletions dist/safe-trim.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* safe-trim v1.0.6
* safe-trim v1.0.9
* (c) 2016 Jerry
* Released under the MIT License.
*/
Expand All @@ -13,8 +13,8 @@ function safeTrim(string) {
var CR_LF = '\r\n'; // Used as a new line character in Windows
var ZERO_WIDTH_SPACE = '\v' + // \x0B VT 垂直制表符
'\f' + // \x0C FF 换页符
'​‌‍‎‏\u000b\u2028\u2029';
var OTHER_SPACE = '  ᠎             　';
'\u200B\u200C\u200D\u200E\u200F\x0B\u2028\u2029\uFEFF';
var OTHER_SPACE = '\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000';

var ALL_SPACE = SP + TAB + CR + LF + CR_LF + ZERO_WIDTH_SPACE + OTHER_SPACE;

Expand All @@ -33,4 +33,4 @@ function safeTrim(string) {
.trim(); // safety
}

module.exports = safeTrim;
module.exports = safeTrim;
8 changes: 4 additions & 4 deletions dist/safe-trim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* safe-trim v1.0.6
* safe-trim v1.0.9
* (c) 2016 Jerry
* Released under the MIT License.
*/
Expand All @@ -17,8 +17,8 @@ function safeTrim(string) {
var CR_LF = '\r\n'; // Used as a new line character in Windows
var ZERO_WIDTH_SPACE = '\v' + // \x0B VT 垂直制表符
'\f' + // \x0C FF 换页符
'​‌‍‎‏\u000b\u2028\u2029';
var OTHER_SPACE = '  ᠎             　';
'\u200B\u200C\u200D\u200E\u200F\x0B\u2028\u2029\uFEFF';
var OTHER_SPACE = '\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000';

var ALL_SPACE = SP + TAB + CR + LF + CR_LF + ZERO_WIDTH_SPACE + OTHER_SPACE;

Expand All @@ -39,4 +39,4 @@ function safeTrim(string) {

return safeTrim;

})));
})));
2 changes: 1 addition & 1 deletion dist/safe-trim.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/safe-trim.min.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{
"name": "safe-trim",
"version": "1.0.6",
"version": "1.0.9",
"description": "trim sting and remove zero-width-space in content",
"main": "dist/safe-trim.common.js",
"directories": {
"test": "test"
},
"devDependencies": {
"babel-core": "^6.13.2",
"babel-preset-es2015": "^6.13.2",
"babel-preset-es2015-rollup": "^1.2.0",
"html-minifier": "^3.0.2",
"istanbul": "^0.4.4",
"babel-core": "^6.18.2",
"babel-preset-es2015": "^6.18.0",
"babel-preset-es2015-rollup": "^3.0.0",
"html-minifier": "^3.2.2",
"istanbul": "^0.4.5",
"jasmine-node": "^1.14.5",
"rollup": "^0.34.7",
"rollup": "^0.37.0",
"rollup-plugin-babel": "^2.6.1",
"rollup-plugin-replace": "^1.1.1",
"uglify-js": "^2.7.0"
"uglify-js": "^2.7.4"
},
"scripts": {
"test": "npm run build && npm run jasmine",
"build": "node build/build.js",
"jasmine": "istanbul cover jasmine-node spec"
"jasmine": "istanbul cover jasmine-node spec",
"prepublish": "npm run build"
},
"repository": {
"type": "git",
Expand All @@ -43,4 +44,4 @@
"url": "https://github.com/haozime/safe-trim/issues"
},
"homepage": "https://github.com/haozime/safe-trim#readme"
}
}