Skip to content

Use lodash.assign in favour of full fat lodash #835

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

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

Use lodash.assign in favour of full fat lodash #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53ef158
Use lodash.assign in favour of full fat lodash
tlvince Oct 8, 2015
086ed5c
Update shrinkwrap
tlvince Oct 11, 2015
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
4 changes: 2 additions & 2 deletions app/templates/_karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var path = require('path');
var conf = require('./gulp/conf');

var _ = require('lodash');
var assign = require('lodash.assign');
var wiredep = require('wiredep');

var pathSrcHtml = [
Expand All @@ -16,7 +16,7 @@ var pathSrcHtml = [
];

function listFiles() {
var wiredepOptions = _.extend({}, conf.wiredep, {
var wiredepOptions = assign({}, conf.wiredep, {
dependencies: true,
devDependencies: true
});
Expand Down
2 changes: 1 addition & 1 deletion app/templates/_package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"gulp-autoprefixer": "~3.0.1",
"gulp-angular-templatecache": "~1.7.0",
"del": "~2.0.1",
"lodash": "~3.10.1",
"lodash.assign": "~3.2.0",
"gulp-minify-css": "~1.2.1",
"gulp-filter": "~3.0.1",
"gulp-flatten": "~0.2.0",
Expand Down
4 changes: 2 additions & 2 deletions app/templates/gulp/_inject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var conf = require('./conf');
var $ = require('gulp-load-plugins')();

var wiredep = require('wiredep').stream;
var _ = require('lodash');
var assign = require('lodash.assign');

<% if (props.cssPreprocessor.key !== 'noCssPrepro') { -%>
gulp.task('inject', ['scripts', 'styles'], function () {
Expand Down Expand Up @@ -51,6 +51,6 @@ gulp.task('inject', ['scripts'], function () {
return gulp.src(path.join(conf.paths.src, '/*.html'))
.pipe($.inject(injectStyles, injectOptions))
.pipe($.inject(injectScripts, injectOptions))
.pipe(wiredep(_.extend({}, conf.wiredep)))
.pipe(wiredep(assign({}, conf.wiredep)))
.pipe(gulp.dest(path.join(conf.paths.tmp, '/serve')));
});
4 changes: 2 additions & 2 deletions app/templates/gulp/_styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var browserSync = require('browser-sync');
var $ = require('gulp-load-plugins')();

var wiredep = require('wiredep').stream;
var _ = require('lodash');
var assign = require('lodash.assign');

gulp.task('styles', function () {
<% if (props.cssPreprocessor.key === 'less') { -%>
Expand Down Expand Up @@ -48,7 +48,7 @@ gulp.task('styles', function () {
path.join(conf.paths.src, '/app/index.<%- props.cssPreprocessor.extension %>')
])
.pipe($.inject(injectFiles, injectOptions))
.pipe(wiredep(_.extend({}, conf.wiredep)))
.pipe(wiredep(assign({}, conf.wiredep)))
<% if (props.cssPreprocessor.key === 'ruby-sass') { -%>
.pipe($.rubySass(sassOptions)).on('error', conf.errorHandler('RubySass'))
.pipe(cssFilter)
Expand Down
Loading