From 169c47ac7fbcc0ee68ddf72abba01ecc3cda0c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Fri, 20 Apr 2018 11:37:28 +0200 Subject: [PATCH] misc: add helper make dev command Running webpack-dev-server is not enough, so add a helper which takes are of doing the needful. --- Makefile | 4 ++++ README.md | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7c5cbdfb4..0ff347801 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ STYLES_BUNDLE = css/all.bundle.css STYLES_DESTINATION = css/all.css STYLES_MAIN = css/main.scss WEBPACK = ./node_modules/.bin/webpack +WEBPACK_DEV_SERVER = ./node_modules/.bin/webpack-dev-server all: compile deploy clean @@ -56,6 +57,9 @@ deploy-css: deploy-local: ([ ! -x deploy-local.sh ] || ./deploy-local.sh) +dev: deploy-init deploy-css deploy-lib-jitsi-meet + $(WEBPACK_DEV_SERVER) + source-package: mkdir -p source_package/jitsi-meet/css && \ cp -r *.js *.html connection_optimization favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \ diff --git a/README.md b/README.md index 494b50a77..d2efaf79c 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ To build the Jitsi Meet application, just type make ``` -## Working with the library sources (lib-jitsi-meet) +### Working with the library sources (lib-jitsi-meet) By default the library is build from its git repository sources. The default dependency path in package.json is : ```json @@ -72,12 +72,12 @@ It allows to link `lib-jitsi-meet` dependency to local source in few steps: ```bash cd lib-jitsi-meet -# create global symlink for lib-jitsi-meet package +#### create global symlink for lib-jitsi-meet package npm link cd ../jitsi-meet -# create symlink from the local node_modules folder to the global lib-jitsi-meet symlink +#### create symlink from the local node_modules folder to the global lib-jitsi-meet symlink npm link lib-jitsi-meet ``` @@ -90,16 +90,17 @@ cd jitsi-meet npm unlink lib-jitsi-meet npm install ``` -## Running with webpack-dev-server for development +### Running with webpack-dev-server for development Use it at the CLI, type ``` -node_modules/.bin/webpack-dev-server +make dev ``` -By default the backend deployment used is `beta.meet.jit.si`, you can point the Jitsi-Meet app at a different backend by using a proxy server. To do this set the WEBPACK_DEV_SERVER_PROXY_TARGET variable, type +By default the backend deployment used is `beta.meet.jit.si`, you can point the Jitsi-Meet app at a different backend by using a proxy server. To do this set the WEBPACK_DEV_SERVER_PROXY_TARGET variable: ``` -WEBPACK_DEV_SERVER_PROXY_TARGET=https://your-example-server.com node_modules/.bin/webpack-dev-server +export WEBPACK_DEV_SERVER_PROXY_TARGET=https://your-example-server.com +make dev ``` The app should be running at https://localhost:8080/ @@ -122,7 +123,7 @@ network but decrypted on the machine that hosts the bridge. The Jitsi Meet architecture allows you to deploy your own version, including all server components, and in that case your security guarantees will be roughly -equivalent to these of a direct one-to-one WebRTC call. This is what's unique to +equivalent to these of a direct one-to-one WebRTC call. This is what's unique to Jitsi Meet in terms of security. The [meet.jit.si](https://meet.jit.si) service is maintained by the Jitsi team