Move Bower dependencies to npm

.dockerignore

@@ -6,7 +6,6 @@
 .idea/
 node_modules/
 npm-debug.log
-res/bower_components/
 res/build/
 rethinkdb_data/
 temp/

.gitignore

@@ -7,7 +7,6 @@
 /*.tgz
 /.env
 /node_modules/
-/res/bower_components/
 /res/build/
 /res/test_out/
 /rethinkdb_data/

.npmignore

@@ -1,7 +1,6 @@
 *.!sync
 .DS_Store
 /*.tgz
-/.bowerrc
 /.dockerignore
 /.editorconfig
 /.env
@@ -13,12 +12,10 @@
 /.python-version
 /.travis.yml
 /Dockerfile
-/bower.json
 /component.json
 /docker
 /gulpfile.js
 /npm-debug.log
-/res/bower_components/
 /res/test/
 /res/web_modules/
 /rethinkdb_data/

Dockerfile

@@ -62,7 +62,6 @@ RUN set -x && \
     npm install --python="/usr/bin/python3"  --loglevel http && \
     npm pack && \
     tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
-    bower cache clean && \
     npm prune --production && \
     mv node_modules /app && \
     rm -rf ~/.node-gyp && \

Dockerfile-debian-armhf

@@ -46,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     echo '--- Assembling app' && \
     echo 'npm pack' | su stf -s /bin/bash && \
     tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
-    echo '/tmp/build/node_modules/.bin/bower cache clean' | su stf -s /bin/bash && \
     echo 'npm prune --production' | su stf -s /bin/bash && \
     mv node_modules /app && \
     chown -R root:root /app && \

Dockerfile-debian-x86_64

@@ -46,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     echo '--- Assembling app' && \
     echo 'npm pack' | su stf -s /bin/bash && \
     tar xzf devicefarmer-stf-*.tgz --strip-components 1 -C /app && \
-    echo '/tmp/build/node_modules/.bin/bower cache clean' | su stf -s /bin/bash && \
     echo 'npm prune --production' | su stf -s /bin/bash && \
     mv node_modules /app && \
     chown -R root:root /app && \

docker/armv7l/Dockerfile

@@ -38,7 +38,6 @@ RUN set -xo pipefail && \
     echo 'npm pack' | su stf -s /bin/sh && \
     tar -xzf stf-*.tgz && \
     mv package /app && \
-    echo 'bower cache clean' | su stf -s /bin/sh && \
     echo 'npm prune --production' | su stf -s /bin/sh && \
     mv node_modules /app && \
     chown -R root:root /app && \

gulpfile.js

@@ -25,8 +25,7 @@ var run = require('gulp-run')
 
 gulp.task('jsonlint', function() {
   return gulp.src([
-      '.bowerrc'
-    , '.yo-rc.json'
+      '.yo-rc.json'
     , '*.json'
     ], {allowEmpty: true})
     .pipe(jsonlint())
@@ -39,7 +38,6 @@ gulp.task('eslint', function() {
   return gulp.src([
       'lib/**/*.js'
     , 'res/**/*.js'
-    , '!res/bower_components/**'
     , '*.js'
   ])
     // eslint() attaches the lint output to the "eslint" property
@@ -201,7 +199,6 @@ gulp.task('webpack:others', function(callback) {
 gulp.task('pug', function() {
   return gulp.src([
       './res/**/*.pug'
-    , '!./res/bower_components/**'
     ])
     .pipe(pug({
       locals: {
@@ -219,7 +216,6 @@ gulp.task('translate:extract', gulp.series('pug', function() {
   return gulp.src([
       './tmp/html/**/*.html'
     , './res/**/*.js'
-    , '!./res/bower_components/**'
     , '!./res/build/**'
     ])
     .pipe(gettext.extract('stf.pot'))

lib/cli/please.js

@@ -1,2 +1,2 @@
-require('please-update-dependencies')(module)
 require('./')
+require('please-update-dependencies')('./package.json')

lib/units/app/index.js

@@ -55,8 +55,6 @@ module.exports = function(options) {
       require('./middleware/webpack')(webpackServerConfig))
   }
 
-  app.use('/static/bower_components',
-    serveStatic(pathutil.resource('bower_components')))
   app.use('/static/app/data', serveStatic(pathutil.resource('data')))
   app.use('/static/app/status', serveStatic(pathutil.resource('common/status')))
   app.use('/static/app/browsers', browserIconMiddleware())

lib/units/auth/ldap.js

@@ -47,8 +47,6 @@ module.exports = function(options) {
   app.use(bodyParser.json())
   app.use(csrf())
   app.use(validator())
-  app.use('/static/bower_components',
-    serveStatic(pathutil.resource('bower_components')))
   app.use('/static/auth/ldap', serveStatic(pathutil.resource('auth/ldap')))
 
   app.use(function(req, res, next) {

lib/units/auth/mock.js

@@ -69,8 +69,6 @@ module.exports = function(options) {
   app.use(bodyParser.json())
   app.use(csrf())
   app.use(validator())
-  app.use('/static/bower_components',
-    serveStatic(pathutil.resource('bower_components')))
   app.use('/static/auth/mock', serveStatic(pathutil.resource('auth/mock')))
 
   app.use(function(req, res, next) {

lib/units/websocket/index.js

@@ -561,7 +561,7 @@ module.exports = function(options) {
             ])
           }
           catch(err) {
-            //workaround for https://github.com/openstf/stf/issues/1180
+            // workaround for https://github.com/openstf/stf/issues/1180
             log.error('input.touchMove had an error', err.stack)
           }
         })

package.json

@@ -30,7 +30,10 @@
   },
   "scripts": {
     "test": "gulp test",
-    "prepare": "bower install && not-in-install && gulp build || in-install"
+    "prepare": "not-in-install && gulp build || in-install",
+    "test:unit": "gulp karma",
+    "test:e2e": "gulp protractor",
+    "lint": "gulp lint"
   },
   "dependencies": {
     "@devicefarmer/adbkit": "^2.11.3",
@@ -46,16 +49,34 @@
     "@julusian/jpeg-turbo": "^0.5.4",
     "@slack/client": "^3.5.4",
     "android-device-list": "^1.2.1",
+    "angular": "1.5.11",
+    "angular-animate": "1.5.11",
+    "angular-borderlayout": "https://github.com/filearts/angular-borderlayout#7c9716aebd9260763f798561ca49d6fbfd4a5c67",
+    "angular-cookies": "1.5.11",
+    "angular-elastic": "2.5.1",
+    "angular-gettext": "2.2.1",
+    "angular-growl-v2": "https://github.com/JanStevens/angular-growl-2#v0.7.9",
+    "angular-hotkeys": "1.6.0",
+    "angular-ladda": "0.3.3",
+    "angular-route": "1.5.11",
+    "angular-touch": "1.5.11",
+    "angular-ui-bootstrap": "1.1.2",
+    "angular-xeditable": "0.1.12",
     "aws-sdk": "^2.4.13",
     "basic-auth": "^1.0.3",
     "bluebird": "^2.10.1",
     "body-parser": "^1.13.3",
+    "bootstrap": "3.3.7",
     "bufferutil": "^4.0.3",
     "chalk": "~1.1.1",
+    "components-font-awesome": "4.7.0",
     "compression": "^1.5.2",
     "cookie-session": "^2.0.0-alpha.1",
     "csurf": "^1.7.0",
+    "d3": "3.5.17",
     "debug": "^2.2.0",
+    "draggabilly": "1.2.4",
+    "epoch-charting": "0.8.4",
     "eventemitter3": "^1.2.0",
     "express": "^4.14.0",
     "express-validator": "^2.20.8",
@@ -72,7 +93,12 @@
     "mime": "^1.3.4",
     "minimatch": "^3.0.3",
     "my-local-ip": "^1.0.0",
+    "ng-context-menu": "https://github.com/swimlane/ng-context-menu#93d825d981dc6f49bcaa861ef5a87fa9d1923f34",
+    "ng-file-upload": "2.2.2",
+    "ng-table": "1.0.0",
+    "oboe": "2.1.5",
     "openid": "^2.0.1",
+    "packery": "1.4.3",
     "passport": "^0.4.1",
     "passport-oauth2": "^1.1.2",
     "passport-saml": "^0.15.0",
@@ -93,6 +119,7 @@
     "swagger-tools": "^0.10.4",
     "temp": "^0.8.1",
     "transliteration": "^2.2.0",
+    "underscore.string": "3.2.3",
     "url-join": "1.1.0",
     "utf-8-validate": "^5.0.0",
     "uuid": "^3.0.0",
@@ -102,8 +129,8 @@
     "zeromq": "^5.0.0"
   },
   "devDependencies": {
+    "angular-mocks": "1.5.11",
     "async": "^2.0.1",
-    "bower": "^1.8.8",
     "chai": "^3.4.1",
     "css-loader": "^0.28.11",
     "del": "^2.0.1",
@@ -112,6 +139,7 @@
     "exports-loader": "^0.7.0",
     "file-loader": "^0.9.0",
     "fs-extra": "^8.1.0",
+    "grunt": "^0.4.0",
     "gulp": "^4.0.2",
     "gulp-angular-gettext": "^2.1.0",
     "gulp-eslint": "^4.0.2",
@@ -158,7 +186,8 @@
     "webpack-dev-server": "^2.11.5"
   },
   "engines": {
-    "node": ">= 6.9"
+    "node": ">= 12",
+    "npm": ">=8.5.5"
   },
   "externalDependencies": {
     "rethinkdb": ">= 2.2",

res/app/control-panes/advanced/run-js/run-js.pug

@@ -16,10 +16,10 @@
         button(ng-click='saveDialog()', ng-disabled='!snippet.editorText').btn.btn-sm.btn-default-outline
           i.fa.fa-save
           span(translate)  Save...
-        button(type='button',
-        ng-disabled='!hasSnippets()').btn.btn-sm.btn-default-outline.uib-dropdown-toggle
+        button(type='button', uib-dropdown-toggle,
+        ng-disabled='!hasSnippets()').btn.btn-sm.btn-default-outline
           span.caret
-        ul.uib-dropdown-menu.pull-right
+        ul(uib-dropdown-menu).pull-right
           li(ng-repeat='snip in snippets')
             a(ng-click='openSnippet(snip)').btn-link {{snip.name}}
           li.divider

res/app/control-panes/dashboard/install/install.pug

@@ -58,7 +58,8 @@
                   span(ng-if='!showManifest') Show Manifest
                 pre.manifest-text(ng-if='showManifest') {{ installation.manifest | json }}
 
-      alert(type='danger', close='clear()', ng-if='installation.error')
+      .alert.alert-danger.alert-dismissible(role="alert", ng-if='installation.error')
         strong(translate) Oops!
-        |  
+        .button.close(type="button", data-dismiss="alert" aria-label="Close")
+          span(aria-hidden="true") ×
         span {{ installation.error | installError | translate }} ({{ installation.error }})

res/app/device-list/device-list.pug

@@ -26,7 +26,7 @@
                   i.fa.fa-columns
                   span(ng-bind='"Customize"|translate')
 
-                ul.uib-dropdown-menu(role='menu').pointer.stf-device-details-customize
+                ul(uib-dropdown-menu, role='menu').pointer.stf-device-details-customize
                   li(ng-repeat='column in columns track by column.name',
                   ng-hide='!adminMode && columnDefinitions[column.name].admin',
                   ng-click='$event.stopPropagation()')

res/app/settings/general/local/index.js

@@ -1,4 +1,4 @@
-require('angular-bootstrap')
+require('angular-ui-bootstrap')
 
 module.exports = angular.module('ui-local-settings', [
   require('stf/settings').name,

res/web_modules/epoch/index.js

@@ -1,8 +1,8 @@
 require('jquery')
 
 require('d3')
-require('epoch/dist/css/epoch.min.css')
-require('epoch/dist/js/epoch.min.js')
+require('epoch-charting/dist/css/epoch.min.css')
+require('epoch-charting/dist/js/epoch.min.js')
 require('ng-epoch')
 
 module.exports = {

res/web_modules/font-lato-2-subset/css/font-lato-2.css

@@ -0,0 +1,28 @@
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 100;
+  src: local('Lato Hair'), local('Lato-Hair'), url(../font/LatoLatinHair-Regular.woff) format('woff');
+  text-rendering: optimizeLegibility;
+}
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Lato Light'), local('Lato-Light'), url(../font/LatoLatinLight-Regular.woff) format('woff');
+  text-rendering: optimizeLegibility;
+}
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Lato Regular'), local('Lato-Regular'), url(../font/LatoLatin-Regular.woff) format('woff');
+  text-rendering: optimizeLegibility;
+}
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Lato Bold'), local('Lato-Bold'), url(../font/LatoLatin-Bold.woff) format('woff');
+  text-rendering: optimizeLegibility;
+}

res/web_modules/font-lato-2-subset/font/LatoLatin-Bold.css

@@ -0,0 +1,11 @@
+/* Webfont: LatoLatin-Bold */@font-face {
+    font-family: 'LatoLatin';
+    src: url('LatoLatin-Bold.eot'); /* IE9 Compat Modes */
+    src: url('LatoLatin-Bold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+         url('LatoLatin-Bold.woff') format('woff'), /* Modern Browsers */
+         url('LatoLatin-Bold.ttf') format('truetype');
+    font-style: normal;
+    font-weight: bold;
+    text-rendering: optimizeLegibility;
+}
+

res/web_modules/font-lato-2-subset/font/LatoLatin-Regular.css

@@ -0,0 +1,11 @@
+/* Webfont: LatoLatin-Regular */@font-face {
+    font-family: 'LatoLatin';
+    src: url('LatoLatin-Regular.eot'); /* IE9 Compat Modes */
+    src: url('LatoLatin-Regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+         url('LatoLatin-Regular.woff') format('woff'), /* Modern Browsers */
+         url('LatoLatin-Regular.ttf') format('truetype');
+    font-style: normal;
+    font-weight: normal;
+    text-rendering: optimizeLegibility;
+}
+