mirror of https://github.com/Chocobozzz/PeerTube
Move CLI dependencies in their own package.json
parent
ff747e7940
commit
7e9d3f259d
|
@ -1,5 +1,6 @@
|
||||||
# NPM instalation
|
# NPM instalation
|
||||||
/node_modules/
|
/node_modules/
|
||||||
|
/server/tools/node_modules
|
||||||
*npm-debug.log
|
*npm-debug.log
|
||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"e2e": "scripty",
|
"e2e": "scripty",
|
||||||
"e2e:local": "scripty",
|
"e2e:local": "scripty",
|
||||||
|
"setup:cli": "scripty",
|
||||||
"build": "SCRIPTY_PARALLEL=true scripty",
|
"build": "SCRIPTY_PARALLEL=true scripty",
|
||||||
"build:server": "scripty",
|
"build:server": "scripty",
|
||||||
"build:client": "scripty",
|
"build:client": "scripty",
|
||||||
|
@ -92,7 +93,6 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"apicache": "^1.4.0",
|
"apicache": "^1.4.0",
|
||||||
"application-config": "^1.0.1",
|
|
||||||
"async": "^2.0.0",
|
"async": "^2.0.0",
|
||||||
"async-lru": "^1.1.1",
|
"async-lru": "^1.1.1",
|
||||||
"bcrypt": "3.0.5",
|
"bcrypt": "3.0.5",
|
||||||
|
@ -148,7 +148,6 @@
|
||||||
"sitemap": "^2.1.0",
|
"sitemap": "^2.1.0",
|
||||||
"socket.io": "^2.2.0",
|
"socket.io": "^2.2.0",
|
||||||
"srt-to-vtt": "^1.1.2",
|
"srt-to-vtt": "^1.1.2",
|
||||||
"summon-install": "^0.4.3",
|
|
||||||
"useragent": "^2.3.0",
|
"useragent": "^2.3.0",
|
||||||
"uuid": "^3.1.0",
|
"uuid": "^3.1.0",
|
||||||
"validator": "^10.2.0",
|
"validator": "^10.2.0",
|
||||||
|
@ -220,8 +219,5 @@
|
||||||
"scripty": {
|
"scripty": {
|
||||||
"silent": true
|
"silent": true
|
||||||
},
|
},
|
||||||
"summon": {
|
|
||||||
"silent": true
|
|
||||||
},
|
|
||||||
"sasslintConfig": "client/.sass-lint.yml"
|
"sasslintConfig": "client/.sass-lint.yml"
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
NOCLIENT=1 yarn install --pure-lockfile
|
||||||
|
|
||||||
|
rm -rf ./dist/server/tools/
|
||||||
|
|
||||||
|
(
|
||||||
|
cd ./server/tools
|
||||||
|
yarn install --pure-lockfile
|
||||||
|
)
|
||||||
|
|
||||||
|
npm run tsc -- --build ./server/tools/tsconfig.json
|
||||||
|
|
||||||
|
cp -r "./server/tools/node_modules" "./dist/server/tools"
|
|
@ -28,7 +28,8 @@ elif [ "$1" = "api-3" ]; then
|
||||||
npm run build:server
|
npm run build:server
|
||||||
sh ./server/tests/api/travis-3.sh 2
|
sh ./server/tests/api/travis-3.sh 2
|
||||||
elif [ "$1" = "api-4" ]; then
|
elif [ "$1" = "api-4" ]; then
|
||||||
npm run build:server
|
npm run setup:cli
|
||||||
|
npm run build-server
|
||||||
sh ./server/tests/api/travis-4.sh 2
|
sh ./server/tests/api/travis-4.sh 2
|
||||||
elif [ "$1" = "lint" ]; then
|
elif [ "$1" = "lint" ]; then
|
||||||
npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
|
npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"name": "@peertube/cli",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"private": true,
|
||||||
|
"dependencies": {
|
||||||
|
"application-config": "^1.0.1",
|
||||||
|
"summon-install": "^0.4.6"
|
||||||
|
},
|
||||||
|
"summon": {
|
||||||
|
"silent": true
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"extends": "../../tsconfig.json",
|
||||||
|
"exclude": [ ] // Overwrite exclude property
|
||||||
|
}
|
File diff suppressed because it is too large
Load Diff
|
@ -35,7 +35,7 @@ You need to follow all the following steps even if you are on a PeerTube server
|
||||||
|
|
||||||
### Dependencies
|
### Dependencies
|
||||||
|
|
||||||
Install the [PeerTube dependencies](dependencies.md).
|
Install the [PeerTube dependencies](dependencies.md) except PostgreSQL and Redis.
|
||||||
|
|
||||||
### Installation
|
### Installation
|
||||||
|
|
||||||
|
@ -44,18 +44,14 @@ Clone the PeerTube repo to get the latest version (even if you are on your PeerT
|
||||||
```
|
```
|
||||||
$ git clone https://github.com/Chocobozzz/PeerTube.git
|
$ git clone https://github.com/Chocobozzz/PeerTube.git
|
||||||
$ CLONE="$(pwd)/PeerTube"
|
$ CLONE="$(pwd)/PeerTube"
|
||||||
|
$ cd ${CLONE}
|
||||||
```
|
```
|
||||||
|
|
||||||
Run ``yarn install --pure-lockfile``
|
Install dependencies and build CLI tools:
|
||||||
```
|
|
||||||
$ cd ${CLONE}
|
|
||||||
$ yarn install --pure-lockfile
|
|
||||||
```
|
|
||||||
|
|
||||||
Build server tools:
|
|
||||||
```
|
```
|
||||||
$ cd ${CLONE}
|
$ NOCLIENT=1 yarn install --pure-lockfile
|
||||||
$ npm run build:server
|
$ npm run setup:cli
|
||||||
```
|
```
|
||||||
|
|
||||||
### CLI wrapper
|
### CLI wrapper
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
"typeRoots": [ "node_modules/@types", "server/typings" ]
|
"typeRoots": [ "node_modules/@types", "server/typings" ]
|
||||||
},
|
},
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
"server/tools/",
|
||||||
"client/node_modules",
|
"client/node_modules",
|
||||||
"node_modules",
|
"node_modules",
|
||||||
"dist",
|
"dist",
|
||||||
|
|
Loading…
Reference in New Issue