Skip to content

Commit

Permalink
Install JS deps via new package.json files (lynckia#1499)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcague authored Nov 11, 2019
1 parent 5fffe48 commit cb2d43c
Show file tree
Hide file tree
Showing 20 changed files with 187 additions and 272 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,15 @@ spine/erizofc.js
spine/testResult.json
extras/basic_example/public/assets/
rtp_media_config.js
erizo/FindIncludePathsGenerator.cmake
erizo/Findboost.cmake
erizo/Findbzip2.cmake
erizo/Findzlib.cmake
erizo/conan.lock
erizo/conan_paths.cmake
erizo/conanbuildinfo.args
erizo/conanbuildinfo.cmake
erizo/conanbuildinfo.txt
erizo/conaninfo.txt
erizo/graph_info.json

3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ MAINTAINER Lynckia

WORKDIR /opt

ARG COMMIT

# Download latest version of the code and install dependencies
RUN apt-get update && apt-get install -y git wget curl
Expand Down Expand Up @@ -32,6 +31,8 @@ RUN ./installErizo.sh -dfeacs && \

WORKDIR /opt/licode

ARG COMMIT

RUN echo $COMMIT > RELEASE
RUN date --rfc-3339='seconds' >> RELEASE
RUN cat RELEASE
Expand Down
29 changes: 29 additions & 0 deletions erizoAPI/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "licode-erizo-api",
"version": "0.1.0",
"description": "Open Source Communication Provider - Erizo API",
"license": "MIT",
"private": true,
"devDependencies": {
"nan": "~2.13.1"
},
"dependencies": {},
"contributors": [
{
"name": "Alvaro Alonso",
"email": "[email protected]"
},
{
"name": "Pedro Rodriguez",
"email": "[email protected]"
},
{
"name": "Javier Cerviño",
"email": "[email protected]"
}
],
"scripts": {
"install": "node-gyp rebuild",
"preinstall": "./lint.sh"
}
}
2 changes: 1 addition & 1 deletion erizo_controller/installErizo_controller.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ check_result() {
echo [erizo_controller] Installing node_modules for erizo_controller

nvm use
npm install --loglevel error amqp [email protected] [email protected] node-getopt [email protected] [email protected] [email protected]
npm install --loglevel error

echo [erizo_controller] Done, node_modules installed

Expand Down
34 changes: 34 additions & 0 deletions erizo_controller/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"name": "licode-erizo-controller",
"version": "0.1.0",
"description": "Open Source Communication Provider - Erizo Controller",
"license": "MIT",
"private": true,
"devDependencies": {},
"dependencies": {
"amqp": "~0.2.7",
"aws-sdk": "~2.566.0",
"express": "~4.17.1",
"log4js": "~1.0.1",
"node-getopt": "~0.3.2",
"prom-client": "~11.2.1",
"sdp-transform": "~2.3.0",
"socket.io": "~2.0.3",
"uuid": "~3.1.0"
},
"contributors": [
{
"name": "Alvaro Alonso",
"email": "[email protected]"
},
{
"name": "Pedro Rodriguez",
"email": "[email protected]"
},
{
"name": "Javier Cerviño",
"email": "[email protected]"
}
],
"scripts": {}
}
29 changes: 29 additions & 0 deletions extras/basic_example/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "licode-basic-example",
"version": "0.1.0",
"description": "Open Source Communication Provider - Basic Example",
"license": "MIT",
"private": true,
"devDependencies": {},
"dependencies": {
"body-parser": "~1.19.0",
"errorhandler": "~1.5.1",
"express": "~4.17.1",
"morgan": "~1.9.1"
},
"contributors": [
{
"name": "Alvaro Alonso",
"email": "[email protected]"
},
{
"name": "Pedro Rodriguez",
"email": "[email protected]"
},
{
"name": "Javier Cerviño",
"email": "[email protected]"
}
],
"scripts": {}
}
3 changes: 1 addition & 2 deletions nuve/installNuve.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ cd nuveAPI
echo [nuve] Installing node_modules for nuve

nvm use
npm install --loglevel error amqp express [email protected] aws-sdk [email protected] node-getopt body-parser
npm install --loglevel error -g google-closure-compiler-js@20180204
npm install --loglevel error
echo [nuve] Done, node_modules installed

cd ../nuveClient/tools
Expand Down
2 changes: 1 addition & 1 deletion nuve/nuveClient/tools/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set -e
mkdir ../dist || true
mkdir ../build || true

google-closure-compiler-js ../src/N.js ../src/N.API.js > ../build/nuve.js
../../node_modules/google-closure-compiler-js/cmd.js ../src/N.js ../src/N.API.js > ../build/nuve.js

./compileDist.sh
2 changes: 1 addition & 1 deletion nuve/nuveClient/tools/compileDist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
mkdir ../dist || true
mkdir ../build || true

google-closure-compiler-js ../lib/xmlhttprequest.js > ../dist/xmlhttprequest.js
../../node_modules/google-closure-compiler-js/cmd.js ../lib/xmlhttprequest.js > ../dist/xmlhttprequest.js

TARGET=../dist/nuve.js

Expand Down
34 changes: 34 additions & 0 deletions nuve/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"name": "licode-nuve",
"version": "0.1.0",
"description": "Open Source Communication Provider - Nuve",
"license": "MIT",
"private": true,
"devDependencies": {
"google-closure-compiler-js": "~20180204.0.0"
},
"dependencies": {
"amqp": "~0.2.7",
"aws-sdk": "~2.566.0",
"body-parser": "~1.19.0",
"express": "~4.17.1",
"log4js": "~1.0.1",
"mongojs": "~2.6.0",
"node-getopt": "~0.3.2"
},
"contributors": [
{
"name": "Alvaro Alonso",
"email": "[email protected]"
},
{
"name": "Pedro Rodriguez",
"email": "[email protected]"
},
{
"name": "Javier Cerviño",
"email": "[email protected]"
}
],
"scripts": {}
}
13 changes: 11 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,25 @@
"devDependencies": {
"async": "^2.1.2",
"chai": "^3.5.0",
"del": "~3.0.0",
"eslint": "^3.19.0",
"eslint-config-airbnb": "^15.0.1",
"eslint-plugin-import": "^2.6.0",
"eslint-plugin-jsx-a11y": "^5.1.0",
"eslint-plugin-react": "^7.1.0",
"expose-loader": "~0.7.5",
"google-closure-compiler-js": "~20170521.0.0",
"gulp": "~3.9.1",
"gulp-eslint": "~3.0.1",
"gulp-sourcemaps": "~2.6.4",
"mocha": "^3.1.2",
"mock-require": "^1.3.0",
"run-sequence": "~2.2.1",
"script-loader": "~0.7.2",
"sinon": "^1.17.6",
"supertest": "^2.0.0",
"vows": "0.6.x",
"webpack-stream": "~4.0.0",
"winston": "~0.7.2"
},
"contributors": [
Expand All @@ -39,8 +48,8 @@
"lintClient": "cd erizo_controller/erizoClient && ../../node_modules/.bin/gulp lint",
"lintErizoController": "./node_modules/.bin/eslint erizo_controller/erizoAgent erizo_controller/erizoController erizo_controller/erizoJS erizo_controller/common erizo_controller/test erizo_controller/ROV",
"lintBasicExample": "./node_modules/.bin/eslint extras/basic_example/basicServer.js extras/basic_example/public",
"lintNuve": "./node_modules/.bin/eslint nuve/",
"lintSpine": "./node_modules/.bin/eslint spine/",
"lintNuve": "./node_modules/.bin/eslint --ignore-pattern node_modules nuve/",
"lintSpine": "./node_modules/.bin/eslint --ignore-pattern node_modules spine/",
"lint": "npm run lintErizoController && npm run lintBasicExample && npm run lintNuve && npm run lintSpine",
"lintErizoAPI": "./erizo/utils/cpplint.py --filter=-legal/copyright,-build/include --linelength=120 ./erizoAPI/*.cc *.h",
"buildErizoAPI": "export ERIZO_HOME=$(pwd)/erizo/ && echo $ERIZO_HOME && cd ./erizoAPI/ && env JOBS=4 ./build.sh"
Expand Down
2 changes: 1 addition & 1 deletion scripts/installBasicExample.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ cp -r ${ROOT}/erizo_controller/erizoClient/dist/assets public/


nvm use
npm install --loglevel error express body-parser morgan errorhandler
npm install --loglevel error
cd $CURRENT_DIR
3 changes: 1 addition & 2 deletions scripts/installErizo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ install_erizo_api(){
cd $ROOT/erizoAPI
. $NVM_CHECK
nvm use
npm install [email protected]
$FAST_BUILD ./build.sh
$FAST_BUILD npm install --unsafe-perm
check_result $?
cd $CURRENT_DIR
}
Expand Down
2 changes: 0 additions & 2 deletions scripts/installMacDeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ install_brew_deps(){
install_nvm_node
nvm use
npm install
npm install -g node-gyp
npm install [email protected] gulp-eslint@3 [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
if [ "$DISABLE_SERVICES" != "true" ]; then
brew install rabbitmq mongodb
fi
Expand Down
2 changes: 0 additions & 2 deletions scripts/installUbuntuDeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ install_apt_deps(){
install_nvm_node
nvm use
npm install
npm install -g node-gyp
npm install [email protected] gulp-eslint@3 [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
sudo apt-get update -y
sudo apt-get install -qq python-software-properties -y
sudo apt-get install -qq software-properties-common -y
Expand Down
19 changes: 0 additions & 19 deletions scripts/travisInstall.sh

This file was deleted.

Loading

0 comments on commit cb2d43c

Please sign in to comment.