mirror of
https://github.com/grafana/grafana.git
synced 2025-08-01 04:41:50 +08:00
Fixed js concat issue
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -20,5 +20,5 @@ src/css/*.min.css
|
|||||||
/grafana-pro
|
/grafana-pro
|
||||||
/grafana
|
/grafana
|
||||||
|
|
||||||
grafana.custom.ini
|
conf/custom.ini
|
||||||
fig.yml
|
fig.yml
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
app_mode = development
|
|
||||||
|
|
||||||
[server]
|
|
||||||
router_logging = false
|
|
||||||
static_root_path = src
|
|
||||||
|
|
||||||
[log]
|
|
||||||
level = Trace
|
|
||||||
mode = console
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -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>
|
||||||
|
|
||||||
|
@ -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'
|
||||||
|
@ -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',
|
||||||
],
|
],
|
||||||
|
Reference in New Issue
Block a user