X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=package.json;h=42acf1b904a33c08f227ea77b9ecc8b79516b269;hb=cb11e775705392df4e2b5529447a5b439338beaf;hp=aabd5616f5f7686d48758dae703e43c495e9d4b9;hpb=bd324a669218f9ed302f7f54b36ee535d25c9733;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/package.json b/package.json
index aabd5616f..42acf1b90 100644
--- a/package.json
+++ b/package.json
@@ -22,45 +22,49 @@
     "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:components": "cd client && node-sass components/ --output components/",
-    "client:sass:components:watch": "cd client && node-sass -w components/ --output components/",
-    "client:sass:components:clean": "cd client && rm -f components/**/*.css",
-    "client:sass": "concurrently \"npm run client:sass:index\" \"npm run client:sass:components\"",
-    "client:sass:watch": "concurrently \"npm run client:sass:index:watch\" \"npm run client:sass:components:watch\"",
-    "client:sass:clean": "concurrently \"npm run client:sass:index:clean\" \"npm run client:sass:components:clean\"",
+    "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 && rm -f components/**/*.js components/**/*.js.map",
-    "dev": "npm run build && concurrently \"npm run livereload\" \"npm run client:tsc:watch\" \"npm run client:sass:watch\" \"npm start\"",
+    "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\"",
     "livereload": "livereload ./client",
     "start": "node server",
-    "test": "standard && mocha server/tests"
+    "test": "cd client && npm test && cd .. && standard && mocha server/tests",
+    "postinstall": "cd client && npm install"
   },
   "dependencies": {
     "async": "^1.2.1",
-    "bittorrent-tracker": "^7.0.0",
+    "bittorrent-tracker": "^8.0.0",
     "body-parser": "^1.12.4",
+    "concurrently": "^2.0.0",
     "config": "^1.14.0",
     "connect-livereload": "^0.5.3",
     "debug": "^2.2.0",
     "dezalgo": "^1.0.3",
     "electron-spawn": "https://github.com/Chocobozzz/electron-spawn",
     "express": "^4.12.4",
+    "express-oauth-server": "https://github.com/Chocobozzz/express-oauth-server",
     "express-validator": "^2.11.0",
-    "jquery": "^2.1.4",
-    "lodash-node": "^3.10.2",
+    "js-yaml": "^3.5.4",
+    "lodash": "^4.11.1",
     "mkdirp": "^0.5.1",
     "mongoose": "^4.0.5",
     "morgan": "^1.5.3",
     "multer": "^1.1.0",
-    "node-ipc": "^6.0.0",
-    "openssl-wrapper": "https://github.com/Chocobozzz/node-openssl-wrapper",
+    "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",
     "ursa": "^0.9.1",
     "validator": "^5.0.0",
-    "webtorrent": "^0.78.1",
+    "webtorrent": "^0.89.0",
     "winston": "^2.1.1",
     "ws": "^1.0.1"
   },