Moved requirejs to bower, #677

This commit is contained in:
Torkel Ödegaard
2015-06-13 23:01:54 +02:00
parent 6f982b2791
commit fd319bd5f5
19 changed files with 722 additions and 418 deletions

View File

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

View File

@@ -40,7 +40,6 @@ module.exports = function(config,grunt) {
// main/common module
name: 'app',
include: [
'css',
'kbn',
'text',
'jquery',
@@ -75,7 +74,6 @@ module.exports = function(config,grunt) {
// create a module for each directory in public/app/panels/
fs.readdirSync(panelPath).forEach(function (panelName) {
requireModules[0].include.push('panels/'+panelName+'/module');
requireModules[0].include.push('text!panels/'+panelName+'/module.html');
});
return { options: options };

View File

@@ -2,7 +2,7 @@ module.exports = function(config) {
return {
dest: {
expand: true,
src: ['**/*.js', '!dashboards/*.js'],
src: ['**/*.js', '!dashboards/*.js', '!vendor/jquery/**/*.js'],
dest: '<%= destDir %>',
cwd: '<%= destDir %>',
options: {