Skipping global installed packages when building viewVendors
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/bower.json b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/bower.json
index bc2289d..101436c 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/bower.json
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/bower.json
@@ -15,13 +15,13 @@
"tests"
],
"dependencies": {
+ },
+ "devDependencies": {
"angular": "~1.4.7",
"angular-route": "~1.4.7",
"angular-cookies": "~1.4.7",
"angular-resource": "~1.4.7",
- "ng-lodash": "~0.3.0"
- },
- "devDependencies": {
+ "ng-lodash": "~0.3.0",
"bootstrap-css": "2.3.2"
}
}
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/build.js b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/build.js
index 09f0114..513543e 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/build.js
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/build.js
@@ -19,6 +19,7 @@
var wiredep = require('wiredep');
var babel = require('gulp-babel');
var angularFilesort = require('gulp-angular-filesort');
+var _ = require('lodash');
module.exports = function(options){
@@ -57,7 +58,7 @@
// copy vendor js output to Django Folder
gulp.task('copyVendor', function(){
- return gulp.src('dist/xosNgVendor.js')
+ return gulp.src(options.dist + 'xos<%= fileName %>Vendor.js')
.pipe(gulp.dest(options.static + 'js/vendor/'));
});
@@ -70,8 +71,17 @@
// minify vendor js files
gulp.task('wiredep', function(){
var bowerDeps = wiredep().js;
+ if(!bowerDeps){
+ return;
+ }
+
+ // remove angular (it's already loaded)
+ _.remove(bowerDeps, function(dep){
+ return dep.indexOf('angular/angular.js') !== -1;
+ });
+
return gulp.src(bowerDeps)
- .pipe(concat('xosNgVendor.js'))
+ .pipe(concat('xos<%= fileName %>Vendor.js'))
.pipe(uglify())
.pipe(gulp.dest(options.dist));
});
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/server.js b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/server.js
index 62fe412..d165c36 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/server.js
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulp/server.js
@@ -85,7 +85,7 @@
// inject bower dependencies with wiredep
gulp.task('bower', function () {
- gulp.src(options.src + 'index.html')
+ return gulp.src(options.src + 'index.html')
.pipe(wiredep({devDependencies: true}))
.pipe(gulp.dest(options.src));
});
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulpfile.js b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulpfile.js
index ad85ab2..94aa335 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulpfile.js
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/gulpfile.js
@@ -18,6 +18,6 @@
require('./gulp/' + file)(options);
});
-gulp.task('default', ['clean'], function () {
+gulp.task('default', function () {
gulp.start('build');
});
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/package.json b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/package.json
index c366893..c3cf6db 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/package.json
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/package.json
@@ -32,6 +32,7 @@
"proxy-middleware": "^0.15.0",
"run-sequence": "^1.1.4",
"wiredep": "^3.0.0-beta",
- "wrench": "^1.5.8"
+ "wrench": "^1.5.8",
+ "lodash": "^3.10.1"
}
}
diff --git a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/prod.html b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/prod.html
index 0174d3e..6d5ffb0 100644
--- a/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/prod.html
+++ b/xos/core/xoslib/ngXosLib/generator-xos/app/templates/src/prod.html
@@ -3,4 +3,5 @@
</div>
<link rel="stylesheet" href="{{ STATIC_URL }}/css/xosLib.css">
+<script src="{{ STATIC_URL }}js/vendor/xos<%= fileName %>Vendor.js"></script>
<script src="{{ STATIC_URL }}js/xos<%= fileName %>.js"></script>
\ No newline at end of file