Skip to content

Commit

Permalink
update version after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jqnote committed Mar 26, 2016
2 parents ecd5fa6 + e1e33b6 commit 5dbc19e
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 36 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules

.DS_Store
2 changes: 2 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules

.DS_Store
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gulp.task('oss', function(){
secretAccessKey: '*********',
endpoint: 'http://oss-cn-***.aliyuncs.com',
apiVersion: '2013-10-15',
prefix: 'assets/js',
prefix: 'assets/js', //for no prefix: prefix: ''
bucket: 'test'
};
//./js/a.js -> <prefix>/a.js
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function oss(option) {
}
var getFileKey = function(){
return option.prefix
+ ((!option.prefix || option.prefix[option.prefix.length - 1]) === '/' ? '' : '/')
+ ((!option.prefix || (option.prefix[option.prefix.length - 1]) === '/') ? '' : '/')
+ (option.versioning ? version + '/' : '')
+ path.relative(file.base, file.path);
};
Expand Down
68 changes: 34 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
{
"name": "gulp-alioss",
"version": "0.1.2",
"description": "A plugin for Gulp that uploads files to Aliyun OSS",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/wefound/gulp-alioss"
},
"engines": {
"node": "*"
},
"dependencies": {
"gulp-util": "~2.2.9",
"minimatch": "^2.0.4",
"moment": "~2.7.0",
"through2": "~0.4.0",
"q": "~1.0.0",
"aliyun-sdk": "~1.3.5"
},
"keywords": [
"gulp",
"plugin",
"aliyun",
"oss"
],
"author": "junqiang <[email protected]> (http://junqiang.wang)",
"license": "MIT",
"bugs": {
"url": "https://github.com/wefound/gulp-alioss/issues"
},
"homepage": "https://github.com/wefound/gulp-alioss"
"name": "gulp-alioss",
"version": "0.1.3",
"description": "A plugin for Gulp that uploads files to Aliyun OSS",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/wefound/gulp-alioss"
},
"engines": {
"node": "*"
},
"dependencies": {
"gulp-util": "~2.2.9",
"minimatch": "^2.0.4",
"moment": "~2.7.0",
"through2": "~0.4.0",
"q": "~1.0.0",
"aliyun-sdk": "~1.3.5"
},
"keywords": [
"gulp",
"plugin",
"aliyun",
"oss"
],
"author": "junqiang <[email protected]> (http://junqiang.wang)",
"license": "MIT",
"bugs": {
"url": "https://github.com/wefound/gulp-alioss/issues"
},
"homepage": "https://github.com/wefound/gulp-alioss"
}

0 comments on commit 5dbc19e

Please sign in to comment.