Merge pull request #142 from GoogleCloudPlatform/boweruigrid

Move client packages from npm to bower

.gitignore

@@ -7,8 +7,9 @@ __pycache__/
 # Deployment folder.
 deploy/
 
-# Node Packages folder.
+# Packages folders.
 node_modules/
+bower_components/
 
 # C extensions
 *.so

README.md

@@ -67,6 +67,12 @@ Set up your workstation
 
          npm install
 
+1. Install Bower and the Bower packages for client-side dependencies, this will
+    create a bower_components directory in the project.
+
+         npm install -g bower
+         bower install
+
 
 Create the App Engine project
 =============================

bower.json

@@ -0,0 +1,24 @@
+{
+  "name": "perfkit-explorer-deps",
+  "version": "23.0.0",
+  "description": "Bower dev/test dependencies for PerfKit Explorer",
+  "author": "Joe Allan Muharsky <jmuharsky@gmail.com>",
+  "dependencies": {},
+  "devDependencies": {
+    "angular": "~1.4.1",
+    "angular-mocks": "~1.4.1",
+    "angular-material": "~0.10.0",
+    "angular-ui-router": "~0.2.15",
+    "angular-ui-grid": "~3.0.0-rc.22",
+    "angular-bootstrap": "~0.10.0",
+    "bootstrap-css-only": "~3.2.0",
+    "codemirror": "~5.3.0",
+    "jquery": "~2.1.4"
+  },
+  "preferGlobal": true,
+  "private": true,
+  "license": "Apache2",
+  "resolutions": {
+    "angular": "~1.4.1"
+  }
+}

client/karma.conf.js

@@ -9,15 +9,15 @@ module.exports = function(config) {
     frameworks: ['jasmine', 'closure', 'jasmine-matchers'],
 
     files: [
-      'third_party/js/jquery/jquery.js',
-      'node_modules/angular/angular.js',
-      'node_modules/angular-aria/angular-aria.js',
-      'node_modules/angular-animate/angular-animate.js',
-      'node_modules/angular-mocks/angular-mocks.js',
-      'third_party/js/bootstrap-ui/bootstrap-ui.js',
-      'third_party/js/codemirror/codemirror.js',
-      'third_party/js/uiGrid/ui-grid.js',
-      'node_modules/angular-material/angular-material.js',
+      'bower_components/jquery/dist/jquery.js',
+      'bower_components/angular/angular.js',
+      'bower_components/angular-aria/angular-aria.js',
+      'bower_components/angular-animate/angular-animate.js',
+      'bower_components/angular-mocks/angular-mocks.js',
+      'bower_components/angular-material/angular-material.js',
+      'bower_components/codemirror/lib/codemirror.js',
+      'bower_components/angular-ui-grid/ui-grid.js',
+      'bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
       'third_party/js/jsapi/jsapi.js',
       // Compiled Product Code
       'deploy/client/perfkit_scripts.js',

gulpfile.js

@@ -25,29 +25,50 @@ gulp.task('third_party', function() {
   gulp.src('third_party/py/**/*.*')
     .pipe(gulp.dest('deploy/server/third_party'));
 
-  gulp.src('node_modules/angular/angular.min.*')
+  gulp.src('bower_components/jquery/dist/jquery.min.*')
+      .pipe(gulp.dest('deploy/client/third_party/jquery'));
+
+  /** Angular */
+  gulp.src('bower_components/angular/angular.min.*')
     .pipe(gulp.dest('deploy/client/third_party/angular'));
 
-  gulp.src('node_modules/angular-animate/angular-animate.min.*')
+  gulp.src('bower_components/angular-animate/angular-animate.min.*')
     .pipe(gulp.dest('deploy/client/third_party/angular'));
 
-  gulp.src('node_modules/angular-aria/angular-aria.min.*')
+  gulp.src('bower_components/angular-aria/angular-aria.min.*')
     .pipe(gulp.dest('deploy/client/third_party/angular'));
 
-  gulp.src('node_modules/angular-mocks/angular-mocks.*')
+  gulp.src('bower_components/angular-mocks/angular-mocks.*')
     .pipe(gulp.dest('deploy/client/third_party/angular'));
 
-  gulp.src('node_modules/angular-material/angular-material.min.*')
+  gulp.src('bower_components/angular-material/angular-material.min.*')
     .pipe(gulp.dest('deploy/client/third_party/angular-material'));
 
-  gulp.src('node_modules/angular-ui-router/release/angular-ui-router.min.js')
-    .pipe(gulp.dest('deploy/client/third_party/angular-ui-router'));
+  /** Angular UI */
+  gulp.src('bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js')
+      .pipe(gulp.dest('deploy/client/third_party/bootstrap-ui'));
+
+  gulp.src('bower_components/bootstrap-css-only/css/bootstrap.min.css')
+      .pipe(gulp.dest('deploy/client/third_party/bootstrap-ui/css'));
+
+  gulp.src('bower_components/bootstrap-css-only/fonts/*.*')
+      .pipe(gulp.dest('deploy/client/third_party/bootstrap-ui/fonts'));
 
-  gulp.src('node_modules/jquery/dist/jquery.min.*')
-    .pipe(gulp.dest('deploy/client/third_party/jquery'));
+  gulp.src('bower_components/angular-ui-router/release/angular-ui-router.min.js')
+      .pipe(gulp.dest('deploy/client/third_party/angular-ui-router'));
 
   gulp.src('third_party/js/uiGrid/ui-grid.*')
-    .pipe(gulp.dest('deploy/client/third_party/ui-grid'));
+      .pipe(gulp.dest('deploy/client/third_party/ui-grid'));
+
+  /** CodeMirror */
+  gulp.src('bower_components/codemirror/lib/codemirror.*')
+      .pipe(gulp.dest('deploy/client/third_party/codemirror'));
+
+  gulp.src('bower_components/codemirror/mode/javascript/*.js')
+      .pipe(gulp.dest('deploy/client/third_party/codemirror/mode/javascript'));
+
+  gulp.src('bower_components/codemirror/mode/sql/*.js')
+      .pipe(gulp.dest('deploy/client/third_party/codemirror/mode/sql'));
 });
 
 gulp.task('common', ['third_party'], function() {

package.json

@@ -1,25 +1,18 @@
 {
   "name": "perfkit-explorer-deps",
-  "version": "1.0.0",
+  "version": "23.0.0",
   "description": "NPM dev/test dependencies for PerfKit Explorer",
   "author": "Joe Allan Muharsky <jmuharsky@gmail.com>",
   "dependencies": {
-    "angular": "^1.3.15",
-    "angular-animate": "^1.3.15",
-    "angular-aria": "^1.3.15",
-    "angular-material": "^0.9.6",
     "gulp": "3.8.x",
     "gulp-closure-compiler": "0.2.x",
     "gulp-concat": "2.5.x",
     "gulp-flatten": "0.0.x",
     "gulp-minify-html": "0.1.x",
     "gulp-ng-html2js": "0.1.x",
     "gulp-uglify": "1.1.x",
-    "jquery": "^2.1.4"
   },
   "devDependencies": {
-    "angular-mocks": "^1.3.15",
-    "angular-ui-router": "^0.2.15",
     "jasmine": "^2.3.1",
     "jasmine-core": "^2.3.4",
     "karma": "^0.12.35",

server/perfkit/explorer/handlers/templates/third-party-scripts.html

@@ -18,13 +18,13 @@
   <link href="[[static_dir]]/third_party/ui-grid/ui-grid.css" rel="stylesheet">
 
   <!-- CodeMirror3 Editor -->
-  <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.3.0/codemirror.js"></script>
-  <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.3.0/mode/javascript/javascript.js"></script>
-  <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.3.0/mode/sql/sql.js"></script>
-  <link href="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.3.0/codemirror.css" rel="stylesheet" />
+  <script src="[[static_dir]]/third_party/codemirror/codemirror.js"></script>
+  <script src="[[static_dir]]/third_party/codemirror/mode/javascript/javascript.js"></script>
+  <script src="[[static_dir]]/third_party/codemirror/mode/sql/sql.js"></script>
+  <link href="[[static_dir]]/third_party/codemirror/codemirror.css" rel="stylesheet" />
 
   <!-- Bootstrap & Bootstrap UI -->
-  <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.10.0/ui-bootstrap-tpls.min.js"></script>
-  <link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet" />
+  <script src="[[static_dir]]/third_party/bootstrap-ui/ui-bootstrap-tpls.min.js"></script>
+  <link href="[[static_dir]]/third_party/bootstrap-ui/css/bootstrap.min.css" rel="stylesheet" />
 
   <script type="text/javascript" src="//www.google.com/jsapi"></script>