From ffa0afae271c2178092e16956a620881f0bb228f Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 17 Mar 2021 15:51:31 +0300 Subject: [PATCH] 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 Date: Wed Mar 17 15:29:29 2021 +0300 all: inc yarn timeout --- Makefile | 2 +- client2/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9288427d..0eb2f8c5 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ SIGN = 1 VERBOSE = 0 VERSION = v0.0.0 YARN = yarn -YARN_FLAGS = --cwd $(CLIENT_BETA_DIR) +YARN_FLAGS = --cwd $(CLIENT_BETA_DIR) --network-timeout 120000 ENV = env\ COMMIT='$(COMMIT)'\ diff --git a/client2/package.json b/client2/package.json index 71f4b70c..df188c7c 100644 --- a/client2/package.json +++ b/client2/package.json @@ -4,7 +4,7 @@ "name": "adguard-home", "version": "0.1.0", "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", "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",