Adapt npm scripts

client/package.json

@@ -13,11 +13,9 @@
     "url": "git://github.com/Chocobozzz/PeerTube.git"
   },
   "scripts": {
-    "typings": "typings",
     "postinstall": "typings install",
-    "test": "standard && tslint -c ./tslint.json angular/**/*.ts",
+    "test": "standard && tslint -c ./tslint.json src/**/*.ts",
-    "build": "webpack --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached",
+    "webpack": "webpack"
-    "watch": "npm run build -- --watch"
   },
   "license": "GPLv3",
   "dependencies": {

package.json

@@ -17,24 +17,17 @@
     "url": "git://github.com/Chocobozzz/PeerTube.git"
   },
   "scripts": {
-    "build": "npm run build:client",
+    "build": "npm run build:client:prod",
-    "build:client": "SCRIPTY_PARALLEL=true scripty",
+    "build:client:dev": "scripty",
-    "build:client:sass": "scripty",
+    "build:client:prod": "scripty",
-    "build:client:tsc": "scripty",
     "clean": "npm run clean:client",
-    "clean:client": "SCRIPTY_PARALLEL=true scripty",
+    "clean:client": "scripty",
-    "clean:client:sass": "scripty",
-    "clean:client:tsc": "scripty",
     "clean:server:test": "scripty",
     "watch:client": "SCRIPTY_PARALLEL=true scripty",
-    "watch:client:livereload": "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": "scripty",
     "help": "scripty",

scripts/build/client/dev.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+cd client || exit -1
+
+npm run webpack -- --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached

scripts/build/client/sass.sh

@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-npm run clean:client:sass
-cd client || exit -1
-
-# Compile index and angular files
-concurrently \
-  "node-sass --include-path node_modules/bootstrap-sass/assets/stylesheets/ stylesheets/application.scss stylesheets/index.css" \
-  "node-sass app/ --output app/"

scripts/build/client/tsc.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-cd client || exit -1
-node systemjs.bundle.js
-npm run tsc

scripts/clean/client/dist.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
 
 cd client || exit -1
-
+rm -rf dist/
-npm run tsc:w

scripts/clean/client/sass.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-cd client || exit -1
-rm -f stylesheets/index.css
-find app -regextype posix-egrep -regex ".*\.(css)$" -exec rm -f {} \;

scripts/clean/client/tsc.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-cd client || exit -1
-find app -regextype posix-egrep -regex ".*\.(js|map)$" -exec rm -f {} \;
-rm -rf ./bundles
-rm -f main.js main.js.map

scripts/dev.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env sh
 
-npm run build
 NODE_ENV=test concurrently \
   "npm run watch:client" \
   "npm start"

scripts/help.sh

@@ -2,23 +2,17 @@
 
 printf "############# PeerTube help #############\n\n"
 printf "npm run ...\n"
-printf "  build                -> Build the application\n"
+printf "  build                -> Build the application for production (alias of build:client:prod)\n"
-printf "  build:client         -> Build the client (css, js files)\n"
+printf "  build:client:dev     -> Build the client for development\n"
-printf "  build:client:sass    -> Build the sass files\n"
+printf "  build:client:prod    -> Build the client for production\n"
-printf "  build:client:tsc     -> Build the javascript files\n"
 printf "  clean                -> Clean the application\n"
-printf "  clean:client         -> Clean the client (css, js files)\n"
+printf "  clean:client         -> Clean the client build files (dist directory)\n"
-printf "  clean:client:sass    -> Clean the sass build files\n"
-printf "  clean:client:tsc     -> Clean the javascript files\n"
 printf "  clean:server:test    -> Clean certificates, logs, uploads and database of the test instances\n"
 printf "  watch:client         -> Watch the client files\n"
-printf "  watch:client:sass    -> Watch the sass client files\n"
-printf "  watch:client:tsc     -> Watch the typescript files\n"
 printf "  danger:clean:server  -> /!\ Clean certificates, logs, uploads and database\n"
 printf "  danger:clean:modules -> /!\ Clean node and typescript modules\n"
 printf "  play                 -> Run 3 fresh nodes so that you can test the communication between them\n"
 printf "  dev                  -> Watch, run the livereload and run the server so that you can develop the application\n"
-printf "  livereload           -> Run the livereload on the client\n"
 printf "  start                -> Run the server\n"
 printf "  test                 -> Run the tests\n"
 printf "  help                 -> Print this help\n"

scripts/watch/client/livereload.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-livereload client/app -e scss 
+livereload client/dist

scripts/watch/client/sass.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-cd client || exit -1
-
-concurrently \
-  "node-sass -w --include-path node_modules/bootstrap-sass/assets/stylesheets/ stylesheets/application.scss stylesheets/index.css" \
-  "node-sass -w app/ --output app/"

scripts/watch/client/webpack.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+cd client || exit -1
+
+npm run webpack -- --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached --watch