mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request: all: inc yarn timeout 

Merge in DNS/adguard-home from yarn-timeout to master

Squashed commit of the following:

commit 219d8dfc9ae161491f66a9fafb7fb5dc4394c451
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 17 15:29:29 2021 +0300

    all: inc yarn timeout
This commit is contained in:
Ainar Garipov 2021-03-17 15:51:31 +03:00
parent 5243399d9d
commit ffa0afae27
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -19,7 +19,7 @@ SIGN = 1
VERBOSE = 0 VERBOSE = 0
VERSION = v0.0.0 VERSION = v0.0.0
YARN = yarn YARN = yarn
YARN_FLAGS = --cwd $(CLIENT_BETA_DIR) YARN_FLAGS = --cwd $(CLIENT_BETA_DIR) --network-timeout 120000
ENV = env\ ENV = env\
COMMIT='$(COMMIT)'\ COMMIT='$(COMMIT)'\

2
client2/package.json
View File

@ -4,7 +4,7 @@
"name": "adguard-home", "name": "adguard-home",
"version": "0.1.0", "version": "0.1.0",
"scripts": { "scripts": {
"build": "rm -rf ../build2 && yarn install && webpack --config ./scripts/webpack/webpack.config.prod.js", "build": "rm -rf ../build2 && yarn install --network-timeout 120000 && webpack --config ./scripts/webpack/webpack.config.prod.js",
"start": "webpack serve --config ./scripts/webpack/webpack.config.dev.js", "start": "webpack serve --config ./scripts/webpack/webpack.config.dev.js",
"generate": "rm -rf ./src/lib/entities ./src/lib/apis && ts-node --compiler-options '{ \"module\": \"CommonJS\" }' ./scripts/generator/index.ts", "generate": "rm -rf ./src/lib/entities ./src/lib/apis && ts-node --compiler-options '{ \"module\": \"CommonJS\" }' ./scripts/generator/index.ts",
"translations:check": "ts-node --compiler-options '{ \"module\": \"CommonJS\" }' ./scripts/plugins/checkTranslations.ts", "translations:check": "ts-node --compiler-options '{ \"module\": \"CommonJS\" }' ./scripts/plugins/checkTranslations.ts",