move devDeps to prod deps; migrate to bootstrap-styl (replaces bootst…

…rap-stylus); make mvn clean delete yarn.lock; remove ref to tty.isatty Change-Id: Icaad1972811782118c117b6129667e80940a883f Signed-off-by: nickboldt <nboldt@redhat.com>
eclipse-che · Aug 23, 2018 · 9dbca3a · 9dbca3a
1 parent c04dd0b
commit 9dbca3a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/dashboard/package.json b/dashboard/package.json
@@ -6,7 +6,7 @@
     "url": "git://github.com/codenvy/che-dashboard.git"
   },
   "license": "EPL-1.0",
-  "devDependencies": {
+  "dependencies": {
     "@angular/core": "4.4.7",
     "angular": "1.4.14",
     "angular-animate": "1.4.14",
@@ -30,25 +30,40 @@
     "angular-ui-codemirror": "0.3.0",
     "angular-uuid4": "0.3.1",
     "angular-websocket": "1.0.9",
+    "bootstrap-stylus": "0.2.2",
+    "bower": "^1.8.4",
+    "codemirror": "5.19.0",
+    "d3": "~3.3.10",
+    "eslint": "~1.0.0",
+    "font-awesome": "4.5.0",
+    "google-material-color": "1.3.1",
+    "grunt-cli": "1.3.1",
+    "jasmine-core": "",
+    "jquery": "2.1.3",
+    "js-yaml": "3.6.1",
+    "jsonlint": "1.6.0",
+    "moment": ">=2.8.0 <2.10.0",
+    "ng-lodash": "0.2.3",
+    "phantomjs": ">=2.1.7",
+    "phantomjs-prebuilt": ">=2.1.1",
+    "rxjs": "^5.1.0",
+    "yarn": ">= 1.0.0",
+    "zone.js": "^0.8.4"
+  },
+  "devDependencies": {
     "awesome-typescript-loader": "^1.1.1",
     "babel-core": "^6.4.5",
     "babel-loader": "^6.2.1",
     "babel-polyfill": "^6.3.14",
     "babel-preset-es2015": "^6.3.13",
-    "bootstrap-stylus": "0.2.2",
+    "bootstrap-styl": "^5.0.8",
     "bower": "^1.8.4",
     "browser-sync": "~2.9.2",
     "browser-sync-spa": "~1.0.2",
     "chalk": "~1.1.1",
-    "codemirror": "5.19.0",
-    "d3": "~3.3.10",
     "del": "~2.0.1",
-    "eslint": "~1.0.0",
     "eslint-loader": "~1.0.0",
     "eslint-plugin-angular": "~0.11.0",
-    "font-awesome": "4.5.0",
-    "google-material-color": "1.3.1",
-    "grunt-cli": "1.3.1",
     "gulp": "~3.9.0",
     "gulp-angular-templatecache": "~1.7.0",
     "gulp-autoprefixer": "~3.0.1",
@@ -74,10 +89,6 @@
     "gulp-useref": "~1.3.0",
     "gulp-util": "~3.0.6",
     "http-proxy-middleware": "~0.8.0",
-    "jasmine-core": "",
-    "jquery": "2.1.3",
-    "js-yaml": "3.6.1",
-    "jsonlint": "1.6.0",
     "karma": "~0.13.9",
     "karma-chrome-launcher": "^0.2.2",
     "karma-coverage": "~0.5.2",
@@ -87,13 +98,10 @@
     "lodash": "4.17.10",
     "main-bower-files": "~2.9.0",
     "minimist": "^1.2.0",
-    "moment": ">=2.8.0 <2.10.0",
-    "ng-lodash": "0.2.3",
     "phantomjs": ">=2.1.7",
     "phantomjs-prebuilt": ">=2.1.1",
     "protractor-jasmine2-screenshot-reporter": "^0.3.3",
     "proxy-middleware": "^0.15.0",
-    "rxjs": "^5.1.0",
     "tslint-loader": "~1.0.1",
     "typescript": "^1.8.10",
     "typings": "^1.4.0",
@@ -102,8 +110,7 @@
     "webpack-stream": "~2.1.0",
     "wiredep": "~2.2.2",
     "wrench": "~1.5.8",
-    "yarn": ">= 1.0.0",
-    "zone.js": "^0.8.4"
+    "yarn": ">= 1.0.0"
   },
   "engines": {
     "node": ">=0.10.0",

diff --git a/dashboard/pom.xml b/dashboard/pom.xml
@@ -183,7 +183,10 @@
                                     <followSymlinks>false</followSymlinks>
                                 </fileset>
                                 <fileset>
-                                    <directory>${basedir}/node_modules</directory>
+                                    <directory>${basedir}</directory>
+                                    <includes>
+                                        <include>yarn.lock</include>
+                                    </includes>
                                     <followSymlinks>false</followSymlinks>
                                 </fileset>
                             </filesets>

diff --git a/dashboard/src/app/index.styl b/dashboard/src/app/index.styl
@@ -18,7 +18,7 @@ che-developers-face()
   width 14px
   padding 0
 
-@import '../../node_modules/bootstrap-stylus/bootstrap/index'
+@import '../../node_modules/bootstrap-styl/bootstrap/index'
 @import '../components/widget'
 @import '../components/codemirror/codemirror'
 

diff --git a/dashboard/src/components/api/json-rpc/che-json-rpc-master-api.ts b/dashboard/src/components/api/json-rpc/che-json-rpc-master-api.ts
@@ -12,7 +12,7 @@
 'use strict';
 import {CheJsonRpcApiClient} from './che-json-rpc-api-service';
 import {ICommunicationClient} from './json-rpc-client';
-import { isatty } from 'tty';
+const tty = require('tty');
 
 enum MasterChannels {
   ENVIRONMENT_OUTPUT = <any>'machine/log',