mirror of https://github.com/akveo/blur-admin
build semi-working
parent
de84aaa77f
commit
5c7fab8e98
23
bower.json
23
bower.json
|
@ -43,5 +43,28 @@
|
|||
"moment": "~2.10.6",
|
||||
"slimScroll": "jquery-slimscroll#~1.3.6",
|
||||
"angular-progress-button-styles": "~0.1.0"
|
||||
},
|
||||
"overrides": {
|
||||
"amcharts": {
|
||||
"main": [
|
||||
"./dist/amcharts/amcharts.js",
|
||||
"./dist/amcharts/plugins/responsive/responsive.min.js",
|
||||
"./dist/amcharts/serial.js",
|
||||
"./dist/amcharts/funnel.js",
|
||||
"./dist/amcharts/pie.js"
|
||||
]
|
||||
},
|
||||
"amcharts-stock": {
|
||||
"main": "./dist/amcharts/amstock.js"
|
||||
},
|
||||
"ammap": {
|
||||
"main": [
|
||||
"./dist/ammap/ammap.js",
|
||||
"./dist/ammap/maps/js/worldLow.js"
|
||||
]
|
||||
},
|
||||
"slimScroll": {
|
||||
"main": "./jquery.slimscroll.js"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ exports.paths = {
|
|||
* to inject css preprocessor deps and js files in karma
|
||||
*/
|
||||
exports.wiredep = {
|
||||
exclude: [/\/bootstrap\.js$/, /\/bootstrap-sass\/.*\.js/, /\/bootstrap\.css/],
|
||||
exclude: [/\/bootstrap\.js$/, /\/bootstrap-sass\/.*\.js/, /\/bootstrap\.css/, /\/require\.js/],
|
||||
directory: 'bower_components'
|
||||
};
|
||||
|
||||
|
|
|
@ -22,12 +22,13 @@ gulp.task('inject', ['scripts', 'styles'], function () {
|
|||
], { read: false });
|
||||
|
||||
var injectScripts = gulp.src([
|
||||
path.join(conf.paths.src, '/assets/js/**/*.js'),
|
||||
path.join(conf.paths.src, '/app/**/*.module.js'),
|
||||
path.join(conf.paths.src, '/app/**/*.js'),
|
||||
path.join('!' + conf.paths.src, '/app/**/*.spec.js'),
|
||||
path.join('!' + conf.paths.src, '/app/**/*.mock.js'),
|
||||
])
|
||||
.pipe($.angularFilesort()).on('error', conf.errorHandler('AngularFilesort'));
|
||||
/*.pipe($.angularFilesort())*/.on('error', conf.errorHandler('AngularFilesort'));
|
||||
|
||||
var injectOptions = {
|
||||
ignorePath: [conf.paths.src, path.join(conf.paths.tmp, '/serve')],
|
||||
|
|
|
@ -25,26 +25,28 @@ var buildStyles = function() {
|
|||
style: 'expanded'
|
||||
};
|
||||
|
||||
/*
|
||||
var injectFiles = gulp.src([
|
||||
path.join(conf.paths.src, '/app/**/*.scss'),
|
||||
path.join(conf.paths.src, '/app/!**!/!*.scss'),
|
||||
path.join('!' + conf.paths.src, '/app/index.scss')
|
||||
], { read: false });
|
||||
|
||||
var injectOptions = {
|
||||
transform: function(filePath) {
|
||||
filePath = filePath.replace(conf.paths.src + '/app/', '');
|
||||
return '@import "' + filePath + '";';
|
||||
return '@import "../../app/' + filePath + '";';
|
||||
},
|
||||
starttag: '// injector',
|
||||
endtag: '// endinjector',
|
||||
addRootSlash: false
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
return gulp.src([
|
||||
path.join(conf.paths.src, '/app/index.scss')
|
||||
path.join(conf.paths.src, '/assets/css/main.scss')
|
||||
])
|
||||
.pipe($.inject(injectFiles, injectOptions))
|
||||
//.pipe($.inject(injectFiles, injectOptions))
|
||||
.pipe(wiredep(_.extend({}, conf.wiredep)))
|
||||
.pipe($.sourcemaps.init())
|
||||
.pipe($.sass(sassOptions)).on('error', conf.errorHandler('Sass'))
|
||||
|
|
Loading…
Reference in New Issue