From 374f8eaff49afcc75fcc52d75c54e0727ba4b744 Mon Sep 17 00:00:00 2001
From: Mike Ng <mike.esokia@gmail.com>
Date: Fri, 19 Jan 2018 15:03:00 +0400
Subject: [PATCH] migrate backbone and underscore to npm and refactored test
 modules

---
 bower.json                                    |  7 ++++---
 package.json                                  | 20 +++++++++----------
 resources/gulp/components/admin.js            |  2 +-
 resources/gulp/components/vendors/backbone.js |  4 ++--
 .../www/prod/js/tests/jquery.Edit.js.html     |  4 ++--
 .../prod/js/tests/jquery.Selection.js.html    |  4 ++--
 .../www/prod/js/tests/jquery.Upload.js.html   |  4 ++--
 .../web/report/report_layout_child.html.twig  |  6 +++---
 www/scripts/tests/admin.html                  |  6 +++---
 www/scripts/tests/common.js                   |  8 ++++----
 www/scripts/tests/login.html                  |  6 +++---
 www/scripts/tests/model.html                  |  6 +++---
 www/scripts/tests/validator.html              |  6 +++---
 13 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/bower.json b/bower.json
index 6f9af1e3db..796ccc38b6 100644
--- a/bower.json
+++ b/bower.json
@@ -2,12 +2,13 @@
   "name": "Phraseanet",
   "version": "4.0.0",
   "dependencies": {
-    "underscore-amd": "~1.4",
     "alchemy-embed-medias": "~0.3.4",
-    "i18next": "~1.6",
-    "backbone-amd": "~1.0"
+    "i18next": "~1.6"
   },
   "resolutions": {
     "jquery": "~1.11.3"
+  },
+  "devDependencies": {
+    "qunit": "v1.11.0"
   }
 }
diff --git a/package.json b/package.json
index 2e5e9cdbed..8a879033c9 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "bower": "^1.6.5",
     "bower-files": "^3.11.3",
     "browser-sync": "^2.10.0",
+    "chai": "^1.6.1",
     "del": "^2.1.0",
     "fs": "0.0.2",
     "gulp": "^3.9.0",
@@ -21,15 +22,16 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "jake": "latest",
-    "path": "^0.12.7",
-    "tmp": "0.0.23",
-    "wrench": "^1.5.8",
-    "chai": "^1.6.1",
     "js-fixtures": "^1.5.3",
     "mocha": "^4.1.0",
+    "path": "^0.12.7",
+    "qunit": "^1.0.0",
+    "qunitjs": "https://github.com/qunitjs/qunit/archive/v1.11.0.tar.gz",
     "sinon": "^1.17.7",
     "sinon-chai": "^2.5.0",
-    "squire": "^1.1.8"
+    "squirejs": "^0.2.1",
+    "tmp": "0.0.23",
+    "wrench": "^1.5.8"
   },
   "engines": {
     "node": ">=5.8"
@@ -43,7 +45,7 @@
   "dependencies": {
     "JSON2": "^0.1.0",
     "alchemy-embed-medias": "^0.4.4",
-    "backbone": "^1.0.0",
+    "backbone": "^1.3.3",
     "blueimp-file-upload": "^8.3.0",
     "blueimp-load-image": "^2.17.1",
     "bootstrap-multiselect": "^0.9.13",
@@ -53,8 +55,7 @@
     "geonames-server-jquery-plugin": "^0.2.2",
     "html5shiv": "^3.7.3",
     "humane-js": "^3.0.6",
-    "i18next": "^1.10.6",
-    "jquery": "^1.11.3",
+    "jquery": "^3.2.1",
     "jquery-lazyload": "^1.9.7",
     "jquery-mobile": "^1.5.0-alpha.1",
     "jquery-simplecolorpicker": "^0.3.1",
@@ -67,10 +68,9 @@
     "normalize-css": "^2.1.0",
     "npm": "^5.6.0",
     "phraseanet-production-client": "^0.32.3",
-    "qunit": "^1.0.0",
     "requirejs": "^2.1.22",
     "tinymce": "^4.0.28",
-    "underscore": "^1.4.4",
+    "underscore": "^1.8.3",
     "zxcvbn": "git+https://github.com/lowe/zxcvbn.git"
   }
 }
diff --git a/resources/gulp/components/admin.js b/resources/gulp/components/admin.js
index 9c14cf4f68..761163be96 100644
--- a/resources/gulp/components/admin.js
+++ b/resources/gulp/components/admin.js
@@ -15,7 +15,7 @@ gulp.task('build-admin-css', function(){
 
 gulp.task('build-admin-js', function(){
     var adminGroup = [
-        config.paths.vendors + 'underscore-amd/underscore.js',
+        config.paths.nodes + 'underscore/underscore.js',
         config.paths.nodes + 'jquery-treeview/jquery.treeview.js',
         // config.paths.vendors + 'jquery-file-upload/js/vendor/jquery.ui.widget.js',
         // config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
diff --git a/resources/gulp/components/vendors/backbone.js b/resources/gulp/components/vendors/backbone.js
index 2e7c65efec..b35c5a4f1b 100644
--- a/resources/gulp/components/vendors/backbone.js
+++ b/resources/gulp/components/vendors/backbone.js
@@ -7,11 +7,11 @@ var utils = require('../../utils.js');
 
 gulp.task('build-underscore', function(){
     return utils.buildJsGroup([
-        config.paths.vendors + 'underscore-amd/underscore.js'
+        config.paths.nodes + 'underscore/underscore.js'
     ], 'underscore', 'vendors/underscore');
 });
 gulp.task('build-backbone', ['build-underscore'], function(){
     return utils.buildJsGroup([
-        config.paths.vendors + 'backbone-amd/backbone.js'
+        config.paths.nodes + 'backbone/backbone.js'
     ], 'backbone', 'vendors/backbone');
 });
diff --git a/resources/www/prod/js/tests/jquery.Edit.js.html b/resources/www/prod/js/tests/jquery.Edit.js.html
index ae93910f6e..2e8a1b22aa 100644
--- a/resources/www/prod/js/tests/jquery.Edit.js.html
+++ b/resources/www/prod/js/tests/jquery.Edit.js.html
@@ -4,9 +4,9 @@
     <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <script src="../../../../../www/assets/vendors/jquery/jquery.js"></script>
-    <script src="../../../../../www/bower_components/qunit/qunit/qunit.js"></script>
+    <script src="../../../../../node_modules/qunitjs/qunit/qunit/qunit.js"></script>
     <script src="../jquery.Edit.js"></script>
-    <link type="text/css" rel="stylesheet" href="../../../../../www/bower_components/qunit/qunit/qunit.css"/>
+    <link type="text/css" rel="stylesheet" href="../../../../../node_modules/qunitjs/qunit/qunit.css"/>
     <script>  $(document).ready(function(){
 
       // disable log messages in tests
diff --git a/resources/www/prod/js/tests/jquery.Selection.js.html b/resources/www/prod/js/tests/jquery.Selection.js.html
index 19cd786c49..c6890f032b 100644
--- a/resources/www/prod/js/tests/jquery.Selection.js.html
+++ b/resources/www/prod/js/tests/jquery.Selection.js.html
@@ -4,9 +4,9 @@
     <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <script src="../../../../../www/assets/vendors/jquery/jquery.js"></script>
-    <script src="../../../../../www/bower_components/qunit/qunit/qunit.js"></script>
+    <script src="../../../../../node_modules/qunitjs/qunit/qunit.js"></script>
     <script src="../jquery.Selection.js"></script>
-    <link type="text/css" rel="stylesheet" href="../../../../../www/bower_components/qunit/qunit/qunit.css"/>
+    <link type="text/css" rel="stylesheet" href="../../../../../node_modules/qunitjs/qunit/qunit.css"/>
     <script>  $(document).ready(function(){
 
 
diff --git a/resources/www/prod/js/tests/jquery.Upload.js.html b/resources/www/prod/js/tests/jquery.Upload.js.html
index a0298210c2..61efd7f49c 100644
--- a/resources/www/prod/js/tests/jquery.Upload.js.html
+++ b/resources/www/prod/js/tests/jquery.Upload.js.html
@@ -5,10 +5,10 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <script src="../../../../../www/assets/vendors/jquery/jquery.js"></script>
         <script src="../../../../../www/assets/vendors/jquery-ui/jquery-ui.js"></script>
-        <script src="../../../../../www/bower_components/qunit/qunit/qunit.js"></script>
+        <script src="../../../../../node_modules/qunitjs/qunit/qunit.js"></script>
         <script src="../../../../../www/assets/vendors/blueimp-load-image/load-image.js"></script>
         <script src="../components/upload/jquery.Upload.js"></script>
-        <link type="text/css" rel="stylesheet" href="../../../../../www/bower_components/qunit/qunit/qunit.css"/>
+        <link type="text/css" rel="stylesheet" href="../../../../../node_modules/qunitjs/qunit/qunit.css"/>
         <script>  $(document).ready(function(){
 
             var getUploadManager = function(){
diff --git a/templates/web/report/report_layout_child.html.twig b/templates/web/report/report_layout_child.html.twig
index 1fae634dc4..9b78aaa6a8 100644
--- a/templates/web/report/report_layout_child.html.twig
+++ b/templates/web/report/report_layout_child.html.twig
@@ -9,20 +9,20 @@
                         <form id="dashboard-form" class="form-inline" method="GET" action="{{ path("report_dashboard") }}">
                             <label for="dminDash" style="color:#eee">{{ "from"|trans|title }}</label>
                             <div class="input-prepend">
-                                <span class="add-on"><i class="icon icon-calendar"></i></span>
+                                <span class="add-on"><i class="icon fa fa-calendar" aria-hidden="true"></i></span>
                                 <input id="dminDash" name="dmin" style="font-size: 14px;width:220px;" size="10" type="text" placeholder="{{ "from"|trans }}" value="{{ "-1 month"|date("Y-m-d") }}">
                             </div>
                             <label for="dmaxDash" style="color:#eee">{{ "to"|trans|title }}</label>
                             <div class="input-prepend">
                                 to
-                                <span class="add-on"><i class="icon icon-calendar"></i></span>
+                                <span class="add-on"><i class="icon fa fa-calendar" aria-hidden="true"></i></span>
                                 <input id="dmaxDash" name="dmax" style="font-size: 14px;width:220px;" size="10" type="text" placeholder="{{ "to"|trans }}" value="{{ "now"|date("Y-m-d") }}">
                             </div>
                             <button class="btn submit-dashboard" type="button">{{ "Generate" | trans }}</button>
                         </form>
                         <div>
                             <span class="text-info" style="font-style: italic">
-                                <i class="icon icon-warning-sign"></i>
+                                <i class="icon fa fa-exclamation-triangle" aria-hidden="true"></i>
                                 {{
                                     "Report generation may take a long time to generate, depending on the number of collections and the period selected." | trans
                                 }}
diff --git a/www/scripts/tests/admin.html b/www/scripts/tests/admin.html
index 53c1d9c5c5..99180cf8e2 100644
--- a/www/scripts/tests/admin.html
+++ b/www/scripts/tests/admin.html
@@ -3,12 +3,12 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Mocha Spec Runner</title>
-    <link rel="stylesheet" href="../../bower_components/mocha/mocha.css">
+    <link rel="stylesheet" href="../../../node_modules/mocha/mocha.css">
 </head>
 <body>
     <div id="mocha"></div>
-    <script src="../../bower_components/mocha/mocha.js"></script>
-    <script src="../../bower_components/sinonjs/sinon.js"></script>
+    <script src="../../../node_modules/mocha/mocha.js"></script>
+    <script src="../../../node_modules/sinon/lib/sinon.js"></script>
     <script src="../../assets/vendors/requirejs/require.js"></script>
     <script src="common.js"></script>
     <script type="text/javascript">
diff --git a/www/scripts/tests/common.js b/www/scripts/tests/common.js
index 79f5204d5d..60d1a5cad8 100644
--- a/www/scripts/tests/common.js
+++ b/www/scripts/tests/common.js
@@ -1,15 +1,15 @@
 require.config({
     baseUrl: "../../scripts",
     paths: {
-        "chai"    : "../bower_components/chai/chai",
-        "fixtures": "../bower_components/js-fixtures/fixtures",
+        "chai": "../../node_modules/chai/lib/chai",
+        "fixtures": "../../node_modules/js-fixtures/fixtures",
         jquery: "../assets/vendors/jquery/jquery.min",
         underscore: "../assets/vendors/underscore/underscore.min",
         backbone: "../assets/vendors/backbone/backbone.min",
         i18n: "../assets/vendors/i18next/i18next.min",
         bootstrap: "../assets/vendors/bootstrap/js/bootstrap.min",
-        "sinonchai": "../bower_components/sinon-chai/lib/sinon-chai",
-        "squire": "../bower_components/squire/src/Squire",
+        "sinonchai": "../../node_modules/sinon-chai/lib/sinon-chai",
+        "squire": "../../node_modules/squirejs/src/Squire",
         "jquery.ui": "../assets/vendors/jquery-ui/jquery-ui.min",
         "jquery.ui.widget": "../assets/vendors/jquery-file-upload/jquery.ui.widget.min",
         "jquery.cookie": "../assets/vendors/jquery.cookie/jquery.cookie.min",
diff --git a/www/scripts/tests/login.html b/www/scripts/tests/login.html
index f16769c7db..106f11a292 100644
--- a/www/scripts/tests/login.html
+++ b/www/scripts/tests/login.html
@@ -3,12 +3,12 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Mocha Spec Runner</title>
-    <link rel="stylesheet" href="../../bower_components/mocha/mocha.css">
+    <link rel="stylesheet" href="../../../node_modules/mocha/mocha.css">
 </head>
 <body>
     <div id="mocha"></div>
-    <script src="../../bower_components/mocha/mocha.js"></script>
-    <script src="../../bower_components/sinonjs/sinon.js"></script>
+    <script src="../../../node_modules/mocha/mocha.js"></script>
+    <script src="../../../node_modules/sinon/lib/sinon.js"></script>
     <script src="../../assets/vendors/requirejs/require.js"></script>
     <script src="common.js"></script>
     <script>
diff --git a/www/scripts/tests/model.html b/www/scripts/tests/model.html
index b5cb48a25c..61ad237169 100644
--- a/www/scripts/tests/model.html
+++ b/www/scripts/tests/model.html
@@ -3,12 +3,12 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Mocha Spec Runner</title>
-    <link rel="stylesheet" href="../../bower_components/mocha/mocha.css">
+    <link rel="stylesheet" href="../../../node_modules/mocha/mocha.css">
 </head>
 <body>
     <div id="mocha"></div>
-    <script src="../../bower_components/mocha/mocha.js"></script>
-    <script src="../../bower_components/sinonjs/sinon.js"></script>
+    <script src="../../../node_modules/mocha/mocha.js"></script>
+    <script src="../../../node_modules/sinon/lib/sinon.js"></script>
     <script src="../../assets/vendors/requirejs/require.js"></script>
     <script src="common.js"></script>
     <script>
diff --git a/www/scripts/tests/validator.html b/www/scripts/tests/validator.html
index 81229a24b4..e13e51649d 100644
--- a/www/scripts/tests/validator.html
+++ b/www/scripts/tests/validator.html
@@ -3,12 +3,12 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>Mocha Spec Runner</title>
-    <link rel="stylesheet" href="../../bower_components/mocha/mocha.css">
+    <link rel="stylesheet" href="../../../node_modules/mocha/mocha.css">
 </head>
 <body>
     <div id="mocha"></div>
-    <script src="../../bower_components/mocha/mocha.js"></script>
-    <script src="../../bower_components/sinonjs/sinon.js"></script>
+    <script src="../../../node_modules/mocha/mocha.js"></script>
+    <script src="../../../node_modules/sinon/lib/sinon.js"></script>
     <script src="../../assets/vendors/requirejs/require.js"></script>
     <script src="common.js"></script>
     <script>