Fix tests

[github/Chocobozzz/PeerTube.git] / package.json

diff --git a/package.json b/package.json
index 38ea52b36215220d2e02035b7e97e1a5fd4b0518..1b83f5eca71b0493f68d3cb332905d22a8d950b9 100644 (file)
--- a/package.json
+++ b/package.json
@@ -17,15 +17,31 @@
     "url": "git://github.com/Chocobozzz/PeerTube.git"
   },
   "scripts": {
-    "start": "grunt dev",
-    "test": "grunt build && standard && mocha tests"
+    "build": "concurrently \"npm run client:sass\" \"npm run client:tsc\"",
+    "client:clean": "concurrently \"npm run client:tsc:clean\" \"npm run client:sass:clean\"",
+    "client:sass:index": "npm run client:sass:index:clean && cd client && node-sass --include-path node_modules/bootstrap-sass/assets/stylesheets/ stylesheets/application.scss stylesheets/index.css",
+    "client:sass:index:watch": "cd client && node-sass -w --include-path node_modules/bootstrap-sass/assets/stylesheets/ stylesheets/application.scss stylesheets/index.css",
+    "client:sass:index:clean": "cd client && rm -f stylesheets/index.css",
+    "client:sass:angular": "cd client && node-sass angular/ --output angular/",
+    "client:sass:angular:watch": "cd client && node-sass -w angular/ --output angular/",
+    "client:sass:angular:clean": "cd client && rm -f angular/**/*.css",
+    "client:sass": "concurrently \"npm run client:sass:index\" \"npm run client:sass:angular\"",
+    "client:sass:watch": "concurrently \"npm run client:sass:index:watch\" \"npm run client:sass:angular:watch\"",
+    "client:sass:clean": "concurrently \"npm run client:sass:index:clean\" \"npm run client:sass:angular:clean\"",
+    "client:tsc": "cd client && npm run tsc",
+    "client:tsc:watch": "cd client && npm run tsc:w",
+    "client:tsc:clean": "cd client && find angular -regextype posix-egrep -regex \".*\\.(js|map)$\" -exec rm -f {} \\;",
+    "dev": "npm run build && concurrently \"npm run livereload\" \"npm run client:tsc:watch\" \"npm run client:sass:watch\" \"npm start\"",
+    "livereload": "livereload ./client",
+    "start": "node server",
+    "test": "standard && mocha server/tests",
+    "postinstall": "cd client && npm install"
   },
   "dependencies": {
     "async": "^1.2.1",
     "bittorrent-tracker": "^7.0.0",
-    "blueimp-file-upload": "^9.10.1",
     "body-parser": "^1.12.4",
-    "bootstrap-sass": "^3.3.5",
+    "concurrently": "^2.0.0",
     "config": "^1.14.0",
     "connect-livereload": "^0.5.3",
     "debug": "^2.2.0",
@@ -33,19 +49,7 @@
     "electron-spawn": "https://github.com/Chocobozzz/electron-spawn",
     "express": "^4.12.4",
     "express-validator": "^2.11.0",
-    "grunt": "^0.4.5",
-    "grunt-browserify": "^4.0.1",
-    "grunt-concurrent": "^2.1.0",
-    "grunt-contrib-clean": "^0.7.0",
-    "grunt-contrib-copy": "0.8.2",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-express-server": "^0.5.1",
-    "grunt-newer": "^1.1.1",
-    "grunt-sass": "^1.1.0",
-    "jade": "^1.10.0",
-    "jquery": "^2.1.4",
-    "js-yaml": "^3.3.1",
-    "load-grunt-tasks": "^3.3.0",
+    "js-yaml": "^3.5.4",
     "lodash-node": "^3.10.2",
     "mkdirp": "^0.5.1",
     "mongoose": "^4.0.5",
@@ -56,20 +60,24 @@
     "request": "^2.57.0",
     "request-replay": "^1.0.2",
     "segfault-handler": "^1.0.0",
-    "time-grunt": "^1.2.1",
     "ursa": "^0.9.1",
-    "validator": "^4.3.0",
-    "webtorrent": "^0.73.0",
+    "validator": "^5.0.0",
+    "webtorrent": "^0.85.1",
     "winston": "^2.1.1",
     "ws": "^1.0.1"
   },
   "devDependencies": {
     "chai": "^3.3.0",
     "mocha": "^2.3.3",
-    "standard": "^5.1.0",
+    "node-livereload": "^0.6.0",
+    "node-sass": "^3.4.2",
+    "standard": "^6.0.1",
     "supertest": "^1.1.0"
   },
   "standard": {
+    "ignore": [
+      "client/"
+    ],
     "globals": [
       "alert",
       "confirm",