Refactoring Directory Layout for Build Process

- Moving bower_componets to src/kibana - Moving server to src/server - Adjusting all the build scripts and tests - Adding proxy for backend server to connect - Adding build steps for jar and server
lucidworks · Sep 8, 2014 · 49017ee · 49017ee
1 parent b24ac94
commit 49017ee
Show file tree

Hide file tree

Showing 2,924 changed files with 1,011,630 additions and 255 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "./src/bower_components"
-}
+  "directory": "./src/kibana/bower_components"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
 
     unitTestDir: __dirname + '/test/unit',
     testUtilsDir: __dirname + '/test/utils',
-    bowerComponentsDir: __dirname + '/src/bower_components',
+    bowerComponentsDir: __dirname + '/src/kibana/bower_components',
 
     meta: {
       banner: '/*! <%= package.name %> - v<%= package.version %> - ' +
@@ -36,4 +36,4 @@ module.exports = function (grunt) {
 
   // load task definitions
   grunt.loadTasks('tasks');
-};
+};
diff --git a/bower.json b/bower.json
@@ -47,5 +47,8 @@
     "requirejs": "~2.1.10",
     "requirejs-text": "~2.0.10"
   },
-  "devDependencies": {}
+  "devDependencies": {},
+  "resolutions": {
+    "angular": ">=1.0.6"
+  }
 }
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "grunt-contrib-requirejs": "~0.4.4",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-mocha": "~0.4.10",
+    "grunt-run": "^0.2.3",
     "http-proxy": "~1.1.4",
     "husky": "~0.6.0",
     "istanbul": "~0.2.4",

diff --git a/server/Rakefile b/server/Rakefile
diff --git a/server/config/puma.rb b/server/config/puma.rb
diff --git a/server/config/web.ru b/server/config/web.ru
diff --git a/server/public/index.html b/server/public/index.html
diff --git a/server/public/test.html b/server/public/test.html
diff --git a/server/routes/api.rb b/server/routes/api.rb
diff --git a/server/routes/base.rb b/server/routes/base.rb
diff --git a/server/routes/home.rb b/server/routes/home.rb
diff --git a/src/kibana/bower_components/FileSaver/.bower.json b/src/kibana/bower_components/FileSaver/.bower.json
@@ -0,0 +1,13 @@
+{
+  "name": "FileSaver",
+  "homepage": "https://github.com/eligrey/FileSaver.js",
+  "_release": "c69c21d488",
+  "_resolution": {
+    "type": "branch",
+    "branch": "master",
+    "commit": "c69c21d488714ec1f9bd08044c0c4522eeb76947"
+  },
+  "_source": "git://github.com/eligrey/FileSaver.js.git",
+  "_target": "*",
+  "_originalSource": "FileSaver"
+}