X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=package.json;h=85b383a69c6409b5c1ee404434ea4858f31b6d65;hb=6d8ada5f24b245d3c84d29d65013f5315cbeff27;hp=678804ed2414fab97e0d79895be64c01a3d8794b;hpb=0c1cbbfe29d91c95f9c574b57adf067654b8b5b4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/package.json b/package.json
index 678804ed2..85b383a69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "peertube",
-  "description": "Prototype of a decentralized video streaming platform using P2P (bittorent) directly in the web browser with webtorrent.",
+  "description": "Prototype of a decentralized video streaming platform using P2P (bittorent) directly in the web browser with WebTorrent and Angular 2.",
   "version": "0.0.1",
   "private": true,
   "licence": "GPLv3",
@@ -17,24 +17,26 @@
     "url": "git://github.com/Chocobozzz/PeerTube.git"
   },
   "scripts": {
-    "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 && NODE_ENV=test concurrently \"npm run livereload\" \"npm run client:tsc:watch\" \"npm run client:sass:watch\" \"npm start\"",
+    "build": "npm run build:client",
+    "build:client": "SCRIPTY_PARALLEL=true scripty",
+    "build:client:sass": "scripty",
+    "build:client:tsc": "scripty",
+    "clean": "npm run clean:client",
+    "clean:client": "SCRIPTY_PARALLEL=true scripty",
+    "clean:client:sass": "scripty",
+    "clean:client:tsc": "scripty",
+    "clean:server:test": "scripty",
+    "watch:client": "SCRIPTY_PARALLEL=true scripty",
+    "watch:client:sass": "scripty",
+    "watch:client:tsc": "scripty",
+    "danger:clean:server": "scripty",
+    "danger:clean:modules": "scripty",
+    "play": "scripty",
+    "dev": "scripty",
     "livereload": "livereload ./client",
     "start": "node server",
-    "test": "cd client && npm test && cd .. && standard && mocha server/tests",
+    "test": "scripty",
+    "help": "scripty",
     "postinstall": "cd client && npm install"
   },
   "dependencies": {
@@ -51,13 +53,14 @@
     "express-oauth-server": "https://github.com/Chocobozzz/express-oauth-server",
     "express-validator": "^2.11.0",
     "js-yaml": "^3.5.4",
-    "lodash-node": "^3.10.2",
+    "lodash": "^4.11.1",
     "mkdirp": "^0.5.1",
     "mongoose": "^4.0.5",
     "morgan": "^1.5.3",
     "multer": "^1.1.0",
     "node-ipc": "^7.0.0",
     "openssl-wrapper": "^0.2.3",
+    "password-generator": "^2.0.2",
     "request": "^2.57.0",
     "request-replay": "^1.0.2",
     "segfault-handler": "^1.0.0",
@@ -72,6 +75,7 @@
     "mocha": "^2.3.3",
     "node-livereload": "^0.6.0",
     "node-sass": "^3.4.2",
+    "scripty": "^1.5.0",
     "standard": "^6.0.1",
     "supertest": "^1.1.0"
   },