Skip to content

Commit

Permalink
Breaking: lodashを依存パッケージから削除
Browse files Browse the repository at this point in the history
  • Loading branch information
sable-virt committed Feb 18, 2016
1 parent 1ef099c commit 6a83334
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 18 deletions.
13 changes: 9 additions & 4 deletions gulp/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* 定数の設定も行う
*/

let _ = require('lodash');
let config = require('../config');
const TYPE_REG = /%type%/g;
/**
Expand All @@ -14,9 +13,15 @@ const TYPE_REG = /%type%/g;
* @returns {*}
*/
function getType(args) {
var result = _.findLast(args, (val) => {
return /^-(?!-)+/.test(val);
});
args = args || [];
let i = args.length;
let result;
while(i--) {
if (/^-(?!-)+/.test(args[i])) {
result = args[i];
break;
}
}
if (result) {
return result.replace(/^-/, '');
}
Expand Down
5 changes: 2 additions & 3 deletions gulp/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
* 指定されたファイルを指定されたディレクトリに複製する
*/
let gulp = require('gulp');
let _ = require('lodash');
let ms = require('merge-stream');
let config = require('./config');
let $ = require('./plugins');

gulp.task('copy', () => {
let files = config.path.copy;
let files = config.path.copy || [];
let stream = ms();
_.forEach(files,(file) => {
files.forEach((file) => {
let st = gulp.src(file.from)
.pipe(gulp.dest(file.to));
stream.add(st);
Expand Down
5 changes: 2 additions & 3 deletions gulp/load.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@

let fs = require('fs');
let path = require('path');
let _ = require('lodash');

// gulpディレクトリにあるタスクをロード
let files = fs.readdirSync(__dirname),
let files = fs.readdirSync(__dirname) || [],
result = [];

_.forEach(files, (file) => {
files.forEach((file) => {
let stats = fs.statSync(path.join(__dirname, file));
if (stats.isFile() && path.extname(file) === '.js') {
let name = path.basename(file, '.js');
Expand Down
1 change: 0 additions & 1 deletion gulp/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
let path = require('path');
let fs = require('fs');
let gulp = require('gulp');
let _ = require('lodash');
let through = require('through2');
let webpack = require('webpack');
let config = require('./config');
Expand Down
4 changes: 2 additions & 2 deletions gulp/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* サーバー起動タスク
*/
let gulp = require('gulp');
let _ = require('lodash');
let merge = require('merge');
let rewrite = require('connect-modrewrite');
let config = require('./config');
let $ = require('./plugins');

gulp.task('server', () => {
let options = _.merge(config.server, {
let options = merge(config.server, {
server: {
baseDir: config.dist,
directory: false,
Expand Down
7 changes: 4 additions & 3 deletions gulp/sprite.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
* スプライト画像とCSSを生成するタスク
*/
let gulp = require('gulp');
let _ = require('lodash');
let extend = require('extend');
let merge = require('merge');
let path = require('path');
let ms = require('merge-stream');
let fs = require('fs');
Expand All @@ -15,7 +16,7 @@ let $ = require('./plugins');
const RETINA = /-2x$/;

gulp.task('sprite', () => {
let op = _.extend({}, config.sprite.options);
let op = extend({}, config.sprite.options);
let template = op.cssTemplate;
if (typeof template === 'string' && path.extname(template) === '.ejs') {
let file = fs.readFileSync(`${process.cwd()}/${template}`);
Expand All @@ -31,7 +32,7 @@ gulp.task('sprite', () => {
let name = paths.pop();
if (!name) return stream;
let isRetina = name.search(RETINA) !== -1;
let options = _.merge({
let options = merge({
cssSpritesheetName: name,
imgName: `${name}${config.sprite.imgExtension}`,
cssName: `_${name}${config.sprite.cssExtension}`,
Expand Down
4 changes: 2 additions & 2 deletions gulp/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SCSSをコンパイルしてAutoprefixerをかける。プロダクションリリース時には圧縮する
*/
let gulp = require('gulp');
let _ = require('lodash');
let merge = require('merge');
let config = require('./config');
let $ = require('./plugins');

Expand All @@ -13,7 +13,7 @@ let cssMqpacker = require('css-mqpacker');

gulp.task('style', () => {
config.style = config.style || {};
let guideOptions = _.merge({
let guideOptions = merge({
out: './guide/'
}, config.styleguide);
let sourcemaps = config.style.sourcemaps || './maps';
Expand Down

0 comments on commit 6a83334

Please sign in to comment.