[WIP][ZEPPELIN-2726] Move angular related pkgs from bower to npm (zeppelin-web)

zeppelin-web/.eslintrc

@@ -13,20 +13,15 @@
     "sourceType": "module"
   },
   "globals": {
-    "angular": false,
     "inject": false,
     "_": false,
     "jQuery": false,
     "hljs": false,
-    "confirm": false,
-    "alert": false,
     "nv": false,
     "ace": false,
     "d3": false,
     "MathJax": false,
     "BootstrapDialog": false,
-    "Handsontable": false,
-    "moment": false,
     "zeppelin" : false,
     "process": false
   },

zeppelin-web/bower.json

@@ -2,37 +2,22 @@
   "name": "zeppelin-web",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "1.5.7",
     "json3": "~3.3.1",
     "es5-shim": "~3.1.0",
     "bootstrap": "~3.2.0",
-    "angular-cookies": "1.5.7",
-    "angular-sanitize": "1.5.7",
-    "angular-animate": "1.5.7",
-    "angular-touch": "1.5.7",
-    "angular-route": "1.5.7",
-    "angular-resource": "1.5.7",
-    "angular-bootstrap": "~2.5.0",
     "angular-websocket": "~1.0.13",
     "ace-builds": "1.2.7",
     "angular-ui-ace": "0.1.3",
+    "jquery": "~3.2.1",
+    "jquery-ui": "~1.12.1",
     "jquery.scrollTo": "~1.4.13",
     "nvd3": "~1.8.5",
-    "angular-dragdrop": "~1.0.8",
     "perfect-scrollbar": "~0.5.4",
-    "ng-sortable": "~1.3.3",
-    "angular-elastic": "~2.4.2",
-    "angular-elastic-input": "~2.2.0",
-    "angular-xeditable": "0.1.12",
     "highlightjs": "^9.4.0",
     "lodash": "~3.9.3",
-    "angular-filter": "~0.5.4",
-    "ngtoast": "~2.0.0",
-    "ng-focus-if": "~1.0.2",
     "bootstrap3-dialog": "bootstrap-dialog#~1.34.7",
     "select2": "^4.0.3",
-    "MathJax": "2.7.0",
-    "ngclipboard": "^1.1.1"
+    "MathJax": "2.7.0"
   },
   "devDependencies": {
     "angular-mocks": "1.5.7"
@@ -66,7 +51,6 @@
     }
   },
   "resolutions": {
-    "ace-builds": "1.2.7",
-    "angular": ">=1.5.0 <1.6"
+    "ace-builds": "1.2.7"
   }
 }

zeppelin-web/karma.conf.js

@@ -43,16 +43,9 @@ module.exports = function(config) {
       // bower:js
       'bower_components/jquery/dist/jquery.js',
       'bower_components/es5-shim/es5-shim.js',
-      'bower_components/angular/angular.js',
       'bower_components/json3/lib/json3.js',
       'bower_components/bootstrap/dist/js/bootstrap.js',
-      'bower_components/angular-cookies/angular-cookies.js',
-      'bower_components/angular-sanitize/angular-sanitize.js',
-      'bower_components/angular-animate/angular-animate.js',
-      'bower_components/angular-touch/angular-touch.js',
-      'bower_components/angular-route/angular-route.js',
-      'bower_components/angular-resource/angular-resource.js',
-      'bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
+      'bower_components/angular/angular.js',
       'bower_components/angular-websocket/angular-websocket.min.js',
       'bower_components/ace-builds/src-noconflict/ace.js',
       'bower_components/ace-builds/src-noconflict/mode-scala.js',
@@ -66,26 +59,16 @@ module.exports = function(config) {
       'bower_components/ace-builds/src-noconflict/ext-language_tools.js',
       'bower_components/ace-builds/src-noconflict/theme-chrome.js',
       'bower_components/angular-ui-ace/ui-ace.js',
+      'bower_components/jquery-ui/jquery-ui.js',
       'bower_components/jquery.scrollTo/jquery.scrollTo.js',
       'bower_components/d3/d3.js',
       'bower_components/nvd3/build/nv.d3.js',
-      'bower_components/jquery-ui/jquery-ui.js',
-      'bower_components/angular-dragdrop/src/angular-dragdrop.js',
       'bower_components/perfect-scrollbar/src/perfect-scrollbar.js',
-      'bower_components/ng-sortable/dist/ng-sortable.js',
-      'bower_components/angular-elastic/elastic.js',
-      'bower_components/angular-elastic-input/dist/angular-elastic-input.min.js',
-      'bower_components/angular-xeditable/dist/js/xeditable.js',
       'bower_components/highlightjs/highlight.pack.js',
       'bower_components/lodash/lodash.js',
-      'bower_components/angular-filter/dist/angular-filter.js',
-      'bower_components/ngtoast/dist/ngToast.js',
-      'bower_components/ng-focus-if/focusIf.js',
       'bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js',
       'bower_components/select2/dist/js/select2.js',
       'bower_components/MathJax/MathJax.js',
-      'bower_components/clipboard/dist/clipboard.js',
-      'bower_components/ngclipboard/dist/ngclipboard.js',
       'bower_components/angular-mocks/angular-mocks.js',
       // endbower
 

zeppelin-web/package.json

@@ -21,14 +21,31 @@
     "test": "karma start karma.conf.js"
   },
   "dependencies": {
+    "angular": "1.5.7",
+    "angular-animate": "1.5.7",
+    "angular-cookies": "1.5.7",
+    "angular-dragdrop": "~1.0.8",
+    "angular-elastic": "~2.5.0",
+    "angular-elastic-input": "~2.2.0",
+    "angular-filter": "~0.5.4",
+    "angular-resource": "1.5.7",
+    "angular-route": "1.5.7",
+    "angular-sanitize": "1.5.7",
+    "angular-touch": "1.5.7",
+    "angular-ui-bootstrap": "~2.5.0",
+    "angular-ui-grid": "^4.0.4",
     "angular-viewport-watch": "github:shahata/angular-viewport-watch",
+    "angular-xeditable": "0.1.12",
     "github-markdown-css": "2.6.0",
-    "angular-ui-grid": "^4.0.4",
     "grunt-angular-templates": "^0.5.7",
     "grunt-dom-munger": "^3.4.0",
     "headroom.js": "^0.9.3",
     "moment": "^2.18.1",
     "moment-duration-format": "^1.3.0",
+    "ng-focus-if": "~1.0.2",
+    "ng-sortable": "~1.3.3",
+    "ng-toast": "~2.0.0",
+    "ngclipboard": "^1.1.1",
     "scrollmonitor": "^1.2.3"
   },
   "devDependencies": {

zeppelin-web/src/app/app.controller.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').controller('MainCtrl', MainCtrl)
 
 function MainCtrl ($scope, $rootScope, $window, arrayOrderingSrv) {

zeppelin-web/src/app/app.controller.test.js

@@ -1,3 +1,5 @@
+import angular from 'angular'
+
 describe('Controller: MainCtrl', function () {
   beforeEach(angular.mock.module('zeppelinWebApp'))
 

zeppelin-web/src/app/app.js

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 import 'headroom.js'
 import 'headroom.js/dist/angular.headroom'
 
@@ -24,6 +26,23 @@ import 'angular-viewport-watch/angular-viewport-watch.js'
 import 'angular-ui-grid/ui-grid.css'
 import 'angular-ui-grid'
 
+import 'angular-cookies'
+import 'angular-sanitize'
+import 'angular-animate'
+import 'angular-touch'
+import 'angular-route'
+import 'angular-resource'
+import 'angular-ui-bootstrap'
+import 'angular-dragdrop'
+import 'angular-elastic'
+import 'angular-elastic-input'
+import 'angular-xeditable'
+import 'angular-filter'
+import 'ng-sortable'
+import 'ngclipboard'
+import 'ng-toast'
+import 'ng-focus-if'
+
 const requiredModules = [
   'ngCookies',
   'ngAnimate',

zeppelin-web/src/app/configuration/configuration.controller.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').controller('ConfigurationCtrl', ConfigurationCtrl)
 
 function ConfigurationCtrl ($scope, $rootScope, $http, baseUrlSrv, ngToast) {

zeppelin-web/src/app/credential/credential.controller.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').controller('CredentialCtrl', CredentialCtrl)
 
 function CredentialCtrl ($scope, $rootScope, $http, baseUrlSrv, ngToast) {

zeppelin-web/src/app/helium/index.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 import HeliumController from './helium.controller'
 
 angular.module('zeppelinWebApp')

zeppelin-web/src/app/home/home.controller.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').controller('HomeCtrl', HomeCtrl)
 
 function HomeCtrl ($scope, noteListDataFactory, websocketMsgSrv, $rootScope, arrayOrderingSrv,

zeppelin-web/src/app/interpreter/interpreter.controller.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 import { ParagraphStatus, } from '../notebook/paragraph/paragraph.status'
 
 angular.module('zeppelinWebApp').controller('InterpreterCtrl', InterpreterCtrl)

zeppelin-web/src/app/interpreter/interpreter.filter.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').filter('sortByKey', sortByKey)
 
 function sortByKey () {

zeppelin-web/src/app/jobmanager/jobmanager.controller.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 import { JobStatus, } from './jobs/job-status'
 
 angular.module('zeppelinWebApp')

zeppelin-web/src/app/jobmanager/jobmanager.filter.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').filter('jobManager', jobManagerFilter)
 
 function jobManagerFilter () {

zeppelin-web/src/app/jobmanager/jobs/job.controller.js

@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
 import moment from 'moment'
 
 import { ParagraphStatus, } from '../../notebook/paragraph/paragraph.status'

zeppelin-web/src/app/notebook/notebook.controller.js

@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
 import moment from 'moment'
 
 import { isParagraphRunning, } from './paragraph/paragraph.status'

zeppelin-web/src/app/notebook/notebook.controller.test.js

@@ -1,3 +1,5 @@
+import angular from 'angular'
+
 describe('Controller: NotebookCtrl', function () {
   beforeEach(angular.mock.module('zeppelinWebApp'))
 

zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js

@@ -17,6 +17,7 @@ import {
   ParagraphStatus, isParagraphRunning,
 } from './paragraph.status'
 
+import angular from 'angular'
 import moment from 'moment'
 require('moment-duration-format')
 

zeppelin-web/src/app/notebook/paragraph/paragraph.controller.test.js

@@ -1,3 +1,5 @@
+import angular from 'angular'
+
 describe('Controller: ParagraphCtrl', function () {
   beforeEach(angular.mock.module('zeppelinWebApp'))
 

zeppelin-web/src/app/notebook/paragraph/result/result.controller.js

@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
 import moment from 'moment'
 
 import DatasetFactory from '../../../tabledata/datasetfactory'

zeppelin-web/src/app/notebookRepos/notebookRepos.controller.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').controller('NotebookReposCtrl', NotebookReposCtrl)
 
 function NotebookReposCtrl ($http, baseUrlSrv, ngToast) {

zeppelin-web/src/app/search/result-list.controller.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').controller('SearchResultCtrl', SearchResultCtrl)
 
 function SearchResultCtrl ($scope, $routeParams, searchService) {

zeppelin-web/src/app/tabledata/network.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 import Transformation from './transformation'
 
 /**

zeppelin-web/src/app/tabledata/networkdata.js

@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
 import TableData from './tabledata'
 import {DatasetType} from './dataset'
 

zeppelin-web/src/app/tabledata/pivot.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 import Transformation from './transformation'
 
 /**

zeppelin-web/src/app/visualization/builtins/visualization-d3network.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 import Visualization from '../visualization'
 import NetworkTransformation from '../../tabledata/network'
 

zeppelin-web/src/app/visualization/builtins/visualization-table.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 import Visualization from '../visualization'
 import PassthroughTransformation from '../../tabledata/passthrough'
 

zeppelin-web/src/app/visualization/builtins/visualization-util.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 export const Widget = {
   CHECKBOX: 'checkbox',
   INPUT: 'input',

zeppelin-web/src/components/arrayOrderingSrv/arrayOrdering.service.js

@@ -12,6 +12,8 @@
  * limitations under the License.
  */
 
+import angular from 'angular'
+
 angular.module('zeppelinWebApp').service('arrayOrderingSrv', arrayOrderingSrv)
 
 function arrayOrderingSrv (TRASH_FOLDER_ID) {