fixup! fixup! CHE-10883 migrate from bower to yarn

dashboard/Dockerfile

@@ -12,16 +12,16 @@
 # Build step: $ docker build -t eclipse-che-dashboard
 # It builds an archive file that can be used by doing later
 #  $ docker run --rm eclipse-che-dashboard | tar -C target/ -zxf -
-FROM node:6.11.2
+FROM node:8.10.0
 
 RUN apt-get update && \
     apt-get install -y git \
     && apt-get -y clean \
     && rm -rf /var/lib/apt/lists/*
 COPY package.json /dashboard/
-RUN cd /dashboard && npm i yarn && node_modules/yarn/bin/yarn install --ignore-scripts
+RUN cd /dashboard && npm i yarn && npx yarn install --ignore-scripts
 COPY . /dashboard/
-RUN cd /dashboard  && node_modules/yarn/bin/yarn
+RUN cd /dashboard  && npx yarn
 RUN cd /dashboard && cd target/ && tar zcf /tmp/dashboard.tar.gz dist/
 
 CMD zcat /tmp/dashboard.tar.gz

dashboard/README.md

@@ -23,7 +23,7 @@ $ mvn -Pnative clean install
 
 Required tools for native build:
 - Python `v2.7.x`(`v3.x.x`currently not supported)
-- Node.js `v4.x.x`, `v5.x.x` or `v6.x.x`
+- Node.js `v5.x.x`, `v6.x.x` or `v8.x.x`
 - npm
 
 Installation instructions for Node.js and npm can be found on the following [link](https://docs.npmjs.com/getting-started/installing-node). 

dashboard/gulp/scripts.js

@@ -25,7 +25,7 @@ var $ = require('gulp-load-plugins')();
 function webpackWrapper(watch, test, callback) {
   var webpackOptions = {
     context: __dirname,
-    resolve: { extensions: ['', '.ts', '.js', '.styl'] },
+    resolve: {extensions: ['', '.ts', '.js', '.styl']},
     watch: watch,
     module: {
       preLoaders: [
@@ -34,7 +34,7 @@ function webpackWrapper(watch, test, callback) {
           exclude: /node_modules/,
           loader: 'tslint-loader'
         }
-          ],
+      ],
       loaders: [
         {
           test: /\.ts$/,
@@ -83,15 +83,15 @@ function webpackWrapper(watch, test, callback) {
         }
       ]
     },
-    output: { filename: 'index.module.js' }
+    output: {filename: 'index.module.js'}
   };
 
-  if(watch) {
+  if (watch) {
     webpackOptions.devtool = 'inline-source-map';
   }
 
-  var webpackChangeHandler = function(err, stats) {
-    if(err) {
+  var webpackChangeHandler = function (err, stats) {
+    if (err) {
       conf.errorHandler('Webpack')(err);
     }
     $.util.log(stats.toString({
@@ -101,13 +101,13 @@ function webpackWrapper(watch, test, callback) {
       version: false
     }));
     browserSync.reload();
-    if(watch) {
+    if (watch) {
       watch = false;
       callback();
     }
   };
 
-  var sources = [ path.join(conf.paths.src, '/index.ts') ];
+  var sources = [path.join(conf.paths.src, '/index.ts')];
   if (test) {
     sources.push(path.join(conf.paths.src, '/{app,components}/**/*.spec.ts'));
   }

dashboard/src/app/stacks/list-stacks/build-stack/recipe-editor/recipe-editor.html

@@ -13,9 +13,9 @@
 -->
 <ng-form name="recipeEditorController.form" class="build-stack-recipe-editor">
 
-  <ui-codemirror ui-codemirror="recipeEditorController.editorOptions"
-                 ng-model-options="{ allowInvalid: true }"
-                 ng-model="recipeContent"></ui-codemirror>
+  <textarea ui-codemirror="recipeEditorController.editorOptions"
+            ng-model-options="{ allowInvalid: true }"
+            ng-model="recipeContent"></textarea>
 
   <che-input che-form="recipeEditorController.form"
              che-name="validator"

dashboard/src/app/workspaces/workspace-details/environments/environments.html

@@ -75,8 +75,8 @@
                        ng-if="workspaceEnvironmentsController.environment.recipe.content">
     <che-show-area>
       <div flex class="recipe-editor">
-        <ui-codemirror ui-codemirror="workspaceEnvironmentsController.editorOptions"
-                       ng-model="workspaceEnvironmentsController.environment.recipe.content"></ui-codemirror>
+        <textarea ui-codemirror="workspaceEnvironmentsController.editorOptions"
+                  ng-model="workspaceEnvironmentsController.environment.recipe.content"></textarea>
       </div>
     </che-show-area>
   </che-label-container>

dashboard/src/app/workspaces/workspace-details/export-workspace/dialog/export-tab-dialog.html

@@ -7,9 +7,9 @@
           </md-tab-label>
           <md-tab-body>
             <div layout="row" flex>
-              <ui-codemirror flex class="workspace-editor"
+              <textarea flex class="workspace-editor"
                              ui-codemirror="exportWorkspaceDialogController.editorOptions"
-                             ng-model="exportWorkspaceDialogController.exportConfigContent"></ui-codemirror>
+                             ng-model="exportWorkspaceDialogController.exportConfigContent"></textarea>
             </div>
             <div layout="row" layout-align="end end">
               <che-button-default che-button-title="download"

dashboard/src/app/workspaces/workspace-details/select-stack/recipe-authoring/workspace-recipe-authoring.html

@@ -2,10 +2,10 @@
   <ng-form name="workspaceRecipeAuthoringForm">
 
     <div layout="column" class="recipe-editor">
-      <ui-codemirror ui-codemirror="workspaceRecipeAuthoringController.editorOptions"
-                     ng-model-options="{ updateOn: 'default blur', debounce: { 'default': 1000, 'blur': 0 }, allowInvalid: true }"
-                     ng-model="workspaceRecipeAuthoringController.recipeScriptCopy"
-                     ng-change="workspaceRecipeAuthoringController.onRecipeChange()"></ui-codemirror>
+      <textarea ui-codemirror="workspaceRecipeAuthoringController.editorOptions"
+                ng-model-options="{ updateOn: 'default blur', debounce: { 'default': 1000, 'blur': 0 }, allowInvalid: true }"
+                ng-model="workspaceRecipeAuthoringController.recipeScriptCopy"
+                ng-change="workspaceRecipeAuthoringController.onRecipeChange()"></textarea>
       <che-input che-form="workspaceRecipeAuthoringForm"
                  che-name="recipe"
                  type="hidden"

dashboard/src/components/attribute/attribute-config.ts

@@ -24,6 +24,7 @@ import {CheMultiTransclude} from './multi-transclude/che-multi-transclude.direct
 import {CheMultiTranscludePart} from './multi-transclude/che-multi-transclude-part.directive';
 import {ImgSrc} from './img-src/img-src.directive';
 import {CheClipTheMiddle} from './clip-the-middle/che-clip-the-middle.directive';
+import {CheUiCodemirrorDirective} from './codemirror/codemirror.directive';
 
 export class AttributeConfig {
 
@@ -52,5 +53,7 @@ export class AttributeConfig {
     register.directive('imgSrc', ImgSrc);
 
     register.directive('cheClipTheMiddle', CheClipTheMiddle);
+    // ui codemirror
+    register.directive('uiCodemirror', CheUiCodemirrorDirective);
   }
 }

dashboard/src/components/widget/codemirror/codemirror.directive.ts → dashboard/src/components/attribute/codemirror/codemirror.directive.ts

@@ -34,7 +34,7 @@ export class CheUiCodemirrorDirective implements ng.IDirective {
 
   static $inject = ['$timeout'];
 
-  restrict = 'EA';
+  restrict = 'A';
   require = 'ngModel';
 
   private $timeout: ng.ITimeoutService;

dashboard/src/components/widget/widget-config.ts

@@ -90,7 +90,6 @@ import {CheEditorController} from './editor/che-editor.controller';
 import {PagingButtons} from './paging-button/paging-button.directive';
 import {CheRowToolbar} from './toolbar/che-row-toolbar.directive';
 import {CheEditModeOverlay} from './edit-mode-overlay/che-edit-mode-overlay.directive';
-import {CheUiCodemirrorDirective} from './codemirror/codemirror.directive';
 
 export class WidgetConfig {
 
@@ -204,7 +203,5 @@ export class WidgetConfig {
     register.directive('toggleButtonPopover', CheToggleButtonPopover);
     // edit overlay
     register.directive('cheEditModeOverlay', CheEditModeOverlay);
-    // ui codemirror
-    register.directive('uiCodemirror', CheUiCodemirrorDirective);
   }
 }