fixup! CHE-10883 migrate from bower to yarn

eclipse-che · Sep 27, 2018 · 2f4578b · 2f4578b
1 parent 1939906
commit 2f4578b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 34 deletions.
diff --git a/dashboard/gulp/scripts.js b/dashboard/gulp/scripts.js
@@ -30,16 +30,16 @@ function webpackWrapper(watch, test, callback) {
     module: {
       loaders: [
         {
-          test: /\.woff(2)?(\?v=\d+\.\d+\.\d+)?$/,
+          test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
           loader: "url-loader?limit=10000&mimetype=application/font-woff"
         }, {
-          test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/,
+          test: /\.woff2(\?v=[0-9]\.[0-9]\.[0-9])?$/,
           loader: "url-loader?limit=10000&mimetype=application/font-woff"
         }, {
-          test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
+          test: /\.ttf(\?v=[0-9]\.[0-9]\.[0-9])?$/,
           loader: "url-loader?limit=10000&mimetype=application/octet-stream"
         }, {
-          test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
+          test: /\.svg(\?v=[0-9]\.[0-9]\.[0-9])?$/,
           loader: "url-loader?limit=10000&mimetype=image/svg+xml"
         },
         {

diff --git a/dashboard/gulp/styles.js b/dashboard/gulp/styles.js
@@ -53,11 +53,11 @@ gulp.task('styles', function () {
     .pipe(browserSync.reload({ stream: true }));
 
   var css = gulp.src([
+    path.join(conf.paths.modules, '/font-awesome/css/font-awesome.css'),
     path.join(conf.paths.modules, '/angular-material/**/*.css'),
     path.join(conf.paths.modules, '/codemirror/lib/codemirror.css'),
     path.join(conf.paths.modules, '/codemirror/addon/lint/lint.css'),
-    path.join(conf.paths.modules, '/codemirror/addon/fold/foldgutter.css'),
-    path.join(conf.paths.modules, '/font-awesome/css/font-awesome.css')
+    path.join(conf.paths.modules, '/codemirror/addon/fold/foldgutter.css')
   ])
     .pipe(concat('css-files.css'));
 

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -103,7 +103,7 @@
     "angular-animate": "1.4.8",
     "angular-aria": "1.4.8",
     "angular-cookies": "1.4.8",
-    "angular-dropdowns": "1.5.0",
+    "angular-dropdowns": "1.5.1",
     "angular-file-upload": "2.0.0",
     "angular-filter": "0.5.4",
     "angular-gravatar": "0.2.4",
@@ -117,12 +117,12 @@
     "angular-ui-bootstrap": "1.1.2",
     "angular-uuid4": "0.3.1",
     "angular-websocket": "1.0.9",
-    "bootstrap-styl": "4.0.2",
+    "bootstrap-styl": "4.0.5",
     "codemirror": "5.19.0",
     "font-awesome": "4.5.0",
     "jquery": "2.1.3",
     "js-yaml": "3.6.1",
-    "jsonlint-mod": "1.7.0",
+    "jsonlint": "1.6.0",
     "ng-lodash": "0.2.3"
   }
 }
diff --git a/dashboard/src/index.html b/dashboard/src/index.html
@@ -22,7 +22,6 @@
     <link rel="shortcut icon" ng-href="{{branding.favicon}}">
 
     <!-- build:css({.tmp/serve,src}) styles/app.css -->
-    <link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css">
     <link rel="stylesheet" type="text/css" href="assets/styles/material-design.css">
     <link rel="stylesheet" type="text/css" href="assets/styles/che-font.css">
     <link rel="stylesheet" type="text/css" href="assets/styles/font.css">
@@ -65,7 +64,7 @@
 
     <!-- DO NOT ADD DIRECTLY JS THERE, THIS IS AUTOMATICALLY ADDED -->
     <!-- build:js(src) scripts/vendor.js -->
-  <script src="../node_modules/jsonlint-mod/lib/jsonlint.js"></script>
+  <script src="../node_modules/jsonlint/lib/jsonlint.js"></script>
     <!-- build:js({.tmp/serve,.tmp/partials}) scripts/app.js -->
     <!-- inject:js -->
     <!-- js files will be automatically insert here -->

diff --git a/dashboard/src/index.ts b/dashboard/src/index.ts
@@ -26,7 +26,7 @@ windowObject.jQuery = $;
 windowObject.jsyaml = require('js-yaml');
 windowObject.CodeMirror = require('codemirror');
 if (windowObject.jsonlint === undefined) {
-  windowObject.jsonlint = require('jsonlint-mod');
+  windowObject.jsonlint = require('jsonlint');
 }
 /* tslint:enable */
 

diff --git a/dashboard/yarn.lock b/dashboard/yarn.lock
@@ -43,7 +43,7 @@
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.10.tgz#e98cc6f05b4b436277671c784ee2f9d05a634f9b"
   integrity sha512-ikB0JHv6vCR1KYUQAzTO4gi/lXLElT4Tx+6De2pc/OZwizE9LRNiTa+U8TBFKBD/nntPnr/MPSHSnOTybjhqNA==
 
-"JSV@>= 4.0.x", JSV@^4.0.x:
+"JSV@>= 4.0.x":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
   integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
@@ -243,10 +243,10 @@ [email protected]:
   resolved "http://registry.npmjs.org/angular-cookies/-/angular-cookies-1.4.8.tgz#07db4bba0234053c64123e958f1ad317d8fd1ed7"
   integrity sha1-B9tLugI0BTxkEj6VjxrTF9j9Htc=
 
-[email protected].0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/angular-dropdowns/-/angular-dropdowns-1.5.0.tgz#177853a6c0bf5ac93309f290dfdce89174eef157"
-  integrity sha1-F3hTpsC/WskzCfKQ39zokXTu8Vc=
+[email protected].1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/angular-dropdowns/-/angular-dropdowns-1.5.1.tgz#bcaaa076627019031bf93a0707f9d7bffde53207"
+  integrity sha1-vKqgdmJwGQMb+ToHB/nXv/3lMgc=
 
 [email protected]:
   version "2.0.0"
@@ -1394,10 +1394,10 @@ [email protected]:
   dependencies:
     hoek "2.x.x"
 
-[email protected].2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/bootstrap-styl/-/bootstrap-styl-4.0.2.tgz#1f97cc9b69e4aec504b4d88f919881b99dcda9d9"
-  integrity sha1-H5fMm2nkrsUEtNiPkZiBuZ3Nqdk=
+[email protected].5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/bootstrap-styl/-/bootstrap-styl-4.0.5.tgz#0e7284e9cccd5802620b22910d5233fb574e73d6"
+  integrity sha1-DnKE6czNWAJiCyKRDVIz+1dOc9Y=
 
 boxen@^0.6.0:
   version "0.6.0"
@@ -6258,22 +6258,14 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-jsonlint-mod@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/jsonlint-mod/-/jsonlint-mod-1.7.0.tgz#fdbcd2a6f3f300f8a65dfd6092681933a0bde939"
-  integrity sha1-/bzSpvPzAPimXf1gkmgZM6C96Tk=
+jsonlint@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.0.tgz#88aa46bc289a7ac93bb46cae2d58a187a9bb494a"
+  integrity sha1-iKpGvCiaesk7tGyuLVihh6m7SUo=
   dependencies:
     JSV ">= 4.0.x"
     nomnom ">= 1.5.x"
 
-jsonlint@^1.6.3:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.3.tgz#cb5e31efc0b78291d0d862fbef05900adf212988"
-  integrity sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==
-  dependencies:
-    JSV "^4.0.x"
-    nomnom "^1.5.x"
-
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -7722,7 +7714,7 @@ node-uuid@~1.4.7:
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
   integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
 
-"nomnom@>= 1.5.x", nomnom@^1.5.x:
+"nomnom@>= 1.5.x":
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
   integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=