Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
bearyan committed Nov 21, 2016
2 parents 88dbc0c + 6940c61 commit cebb3fd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ WeUI 为微信 Web 服务量身设计
[![Build Status](https://travis-ci.org/weui/weui.svg?branch=master)](https://travis-ci.org/weui/weui)
[![npm version](https://img.shields.io/npm/v/weui.svg)](https://www.npmjs.org/package/weui)
[![Gitter](https://badges.gitter.im/weui/weui.svg)](https://gitter.im/weui/weui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![QQ](http://pub.idqqimg.com/wpa/images/group.png)](http://jq.qq.com/?_wv=1027&k=413HLfV)

## 概述

Expand Down
18 changes: 16 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

var path = require('path');
var fs = require('fs');
var yargs = require('yargs').argv;
var gulp = require('gulp');
var less = require('gulp-less');
var header = require('gulp-header');
Expand All @@ -13,6 +12,21 @@ var rename = require('gulp-rename');
var sourcemaps = require('gulp-sourcemaps');
var browserSync = require('browser-sync');
var pkg = require('./package.json');
var yargs = require('yargs')
.options({
'w': {
alias: 'watch',
type: 'boolean'
},
's': {
alias: 'server',
type: 'boolean'
},
'p': {
alias: 'port',
type: 'number'
}
}).argv;

var option = {base: 'src'};
var dist = __dirname + '/dist';
Expand Down Expand Up @@ -124,4 +138,4 @@ gulp.task('default', ['release'], function () {
if (yargs.w) {
gulp.start('watch');
}
});
});

0 comments on commit cebb3fd

Please sign in to comment.