Fixed js concat issue

This commit is contained in:
Torkel Ödegaard
2015-03-04 10:04:59 +01:00
parent 14766ad38e
commit d043ee9407
5 changed files with 4 additions and 16 deletions

2
.gitignore vendored
View File

@ -20,5 +20,5 @@ src/css/*.min.css
/grafana-pro /grafana-pro
/grafana /grafana
grafana.custom.ini conf/custom.ini
fig.yml fig.yml

View File

@ -1,12 +0,0 @@
app_mode = development
[server]
router_logging = false
static_root_path = src
[log]
level = Trace
mode = console

View File

@ -22,7 +22,7 @@
<!-- build:js app/app.js --> <!-- build:js app/app.js -->
<script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script> <script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script>
<script src="[[.AppSubUrl]]/public/app/components/require.config.js"></script> <script src="[[.AppSubUrl]]/public/app/components/require.backend.js"></script>
<!-- endbuild --> <!-- endbuild -->
</head> </head>

View File

@ -30,7 +30,7 @@ module.exports = function(config) {
js: { js: {
src: [ src: [
'<%= destDir %>/vendor/require/require.js', '<%= destDir %>/vendor/require/require.js',
'<%= destDir %>/app/components/require.<%= mode %>.js', '<%= destDir %>/app/components/require.config.js',
'<%= destDir %>/app/app.js', '<%= destDir %>/app/app.js',
], ],
dest: '<%= destDir %>/app/app.js' dest: '<%= destDir %>/app/app.js'

View File

@ -5,13 +5,13 @@ module.exports = function(config) {
cwd:'<%= tempDir %>', cwd:'<%= tempDir %>',
src: [ src: [
'app/controllers/**/*.js', 'app/controllers/**/*.js',
'app/plugins/**/*.js',
'app/directives/**/*.js', 'app/directives/**/*.js',
'app/services/**/*.js', 'app/services/**/*.js',
'app/filters/**/*.js', 'app/filters/**/*.js',
'app/features/**/*.js', 'app/features/**/*.js',
'app/panels/**/*.js', 'app/panels/**/*.js',
'app/routes/**/*.js', 'app/routes/**/*.js',
'plugins/**/*.js',
'app/app.js', 'app/app.js',
'vendor/angular/**/*.js', 'vendor/angular/**/*.js',
], ],