aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-06-03 22:34:39 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-06-03 22:34:39 +0200
commitfc76359be11956f8514fc0dda1f66bb1c3397d26 (patch)
tree4d80142778971f1d9e09606e8f8745d56cee8507 /scripts
parent4a6995be18b15de1834a39c8921a0e4109671bb6 (diff)
downloadPeerTube-fc76359be11956f8514fc0dda1f66bb1c3397d26.tar.gz
PeerTube-fc76359be11956f8514fc0dda1f66bb1c3397d26.tar.zst
PeerTube-fc76359be11956f8514fc0dda1f66bb1c3397d26.zip
Adapt npm scripts
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/client/dev.sh5
-rwxr-xr-xscripts/build/client/sass.sh9
-rwxr-xr-xscripts/build/client/tsc.sh5
-rwxr-xr-xscripts/clean/client/dist.sh (renamed from scripts/watch/client/tsc.sh)3
-rwxr-xr-xscripts/clean/client/sass.sh5
-rwxr-xr-xscripts/clean/client/tsc.sh6
-rwxr-xr-xscripts/dev.sh1
-rwxr-xr-xscripts/help.sh14
-rwxr-xr-xscripts/watch/client/livereload.sh2
-rwxr-xr-xscripts/watch/client/sass.sh7
-rwxr-xr-xscripts/watch/client/webpack.sh5
11 files changed, 16 insertions, 46 deletions
diff --git a/scripts/build/client/dev.sh b/scripts/build/client/dev.sh
new file mode 100755
index 000000000..b75b72f12
--- /dev/null
+++ b/scripts/build/client/dev.sh
@@ -0,0 +1,5 @@
1#!/usr/bin/env sh
2
3cd client || exit -1
4
5npm run webpack -- --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached
diff --git a/scripts/build/client/sass.sh b/scripts/build/client/sass.sh
deleted file mode 100755
index d8dfedca3..000000000
--- a/scripts/build/client/sass.sh
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/usr/bin/env sh
2
3npm run clean:client:sass
4cd client || exit -1
5
6# Compile index and angular files
7concurrently \
8 "node-sass --include-path node_modules/bootstrap-sass/assets/stylesheets/ stylesheets/application.scss stylesheets/index.css" \
9 "node-sass app/ --output app/"
diff --git a/scripts/build/client/tsc.sh b/scripts/build/client/tsc.sh
deleted file mode 100755
index cca1643d4..000000000
--- a/scripts/build/client/tsc.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/usr/bin/env sh
2
3cd client || exit -1
4node systemjs.bundle.js
5npm run tsc
diff --git a/scripts/watch/client/tsc.sh b/scripts/clean/client/dist.sh
index f00656d2e..2cbbf90dc 100755
--- a/scripts/watch/client/tsc.sh
+++ b/scripts/clean/client/dist.sh
@@ -1,5 +1,4 @@
1#!/usr/bin/env sh 1#!/usr/bin/env sh
2 2
3cd client || exit -1 3cd client || exit -1
4 4rm -rf dist/
5npm run tsc:w
diff --git a/scripts/clean/client/sass.sh b/scripts/clean/client/sass.sh
deleted file mode 100755
index 04d239ffc..000000000
--- a/scripts/clean/client/sass.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/usr/bin/env sh
2
3cd client || exit -1
4rm -f stylesheets/index.css
5find app -regextype posix-egrep -regex ".*\.(css)$" -exec rm -f {} \;
diff --git a/scripts/clean/client/tsc.sh b/scripts/clean/client/tsc.sh
deleted file mode 100755
index b17888640..000000000
--- a/scripts/clean/client/tsc.sh
+++ /dev/null
@@ -1,6 +0,0 @@
1#!/usr/bin/env sh
2
3cd client || exit -1
4find app -regextype posix-egrep -regex ".*\.(js|map)$" -exec rm -f {} \;
5rm -rf ./bundles
6rm -f main.js main.js.map
diff --git a/scripts/dev.sh b/scripts/dev.sh
index ddb5b8d33..e792c1448 100755
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -1,6 +1,5 @@
1#!/usr/bin/env sh 1#!/usr/bin/env sh
2 2
3npm run build
4NODE_ENV=test concurrently \ 3NODE_ENV=test concurrently \
5 "npm run watch:client" \ 4 "npm run watch:client" \
6 "npm start" 5 "npm start"
diff --git a/scripts/help.sh b/scripts/help.sh
index 3ed9f15cc..a2c8e4df0 100755
--- a/scripts/help.sh
+++ b/scripts/help.sh
@@ -2,23 +2,17 @@
2 2
3printf "############# PeerTube help #############\n\n" 3printf "############# PeerTube help #############\n\n"
4printf "npm run ...\n" 4printf "npm run ...\n"
5printf " build -> Build the application\n" 5printf " build -> Build the application for production (alias of build:client:prod)\n"
6printf " build:client -> Build the client (css, js files)\n" 6printf " build:client:dev -> Build the client for development\n"
7printf " build:client:sass -> Build the sass files\n" 7printf " build:client:prod -> Build the client for production\n"
8printf " build:client:tsc -> Build the javascript files\n"
9printf " clean -> Clean the application\n" 8printf " clean -> Clean the application\n"
10printf " clean:client -> Clean the client (css, js files)\n" 9printf " clean:client -> Clean the client build files (dist directory)\n"
11printf " clean:client:sass -> Clean the sass build files\n"
12printf " clean:client:tsc -> Clean the javascript files\n"
13printf " clean:server:test -> Clean certificates, logs, uploads and database of the test instances\n" 10printf " clean:server:test -> Clean certificates, logs, uploads and database of the test instances\n"
14printf " watch:client -> Watch the client files\n" 11printf " watch:client -> Watch the client files\n"
15printf " watch:client:sass -> Watch the sass client files\n"
16printf " watch:client:tsc -> Watch the typescript files\n"
17printf " danger:clean:server -> /!\ Clean certificates, logs, uploads and database\n" 12printf " danger:clean:server -> /!\ Clean certificates, logs, uploads and database\n"
18printf " danger:clean:modules -> /!\ Clean node and typescript modules\n" 13printf " danger:clean:modules -> /!\ Clean node and typescript modules\n"
19printf " play -> Run 3 fresh nodes so that you can test the communication between them\n" 14printf " play -> Run 3 fresh nodes so that you can test the communication between them\n"
20printf " dev -> Watch, run the livereload and run the server so that you can develop the application\n" 15printf " dev -> Watch, run the livereload and run the server so that you can develop the application\n"
21printf " livereload -> Run the livereload on the client\n"
22printf " start -> Run the server\n" 16printf " start -> Run the server\n"
23printf " test -> Run the tests\n" 17printf " test -> Run the tests\n"
24printf " help -> Print this help\n" 18printf " help -> Print this help\n"
diff --git a/scripts/watch/client/livereload.sh b/scripts/watch/client/livereload.sh
index 5f095265e..11d27754f 100755
--- a/scripts/watch/client/livereload.sh
+++ b/scripts/watch/client/livereload.sh
@@ -1,3 +1,3 @@
1#!/usr/bin/env sh 1#!/usr/bin/env sh
2 2
3livereload client/app -e scss 3livereload client/dist
diff --git a/scripts/watch/client/sass.sh b/scripts/watch/client/sass.sh
deleted file mode 100755
index f7a8c8a2b..000000000
--- a/scripts/watch/client/sass.sh
+++ /dev/null
@@ -1,7 +0,0 @@
1#!/usr/bin/env sh
2
3cd client || exit -1
4
5concurrently \
6 "node-sass -w --include-path node_modules/bootstrap-sass/assets/stylesheets/ stylesheets/application.scss stylesheets/index.css" \
7 "node-sass -w app/ --output app/"
diff --git a/scripts/watch/client/webpack.sh b/scripts/watch/client/webpack.sh
new file mode 100755
index 000000000..3e4522547
--- /dev/null
+++ b/scripts/watch/client/webpack.sh
@@ -0,0 +1,5 @@
1#!/usr/bin/env sh
2
3cd client || exit -1
4
5npm run webpack -- --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached --watch