Travis -- fix build on OSX, simplify travis and get rid of yarn

.travis.yml

@@ -6,18 +6,10 @@ go:
   - master
   - tip
 
-node_js:
-  - lts/*
-
 os:
   - linux
   - osx
 
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install yarn; fi
-
 script:
   - cd dnsfilter && go get -d -t . && go test
   - cd ../coredns_plugin && go get -d -t . && go test

Makefile

@@ -12,8 +12,8 @@ all: build
 build: AdguardDNS coredns
 
 $(STATIC):
-	yarn --cwd client install
+	cd client; npm install
-	yarn --cwd client run build-prod
+	cd client; npm run build-prod
 
 AdguardDNS: $(STATIC) *.go
 	echo mkfile_dir = $(mkfile_dir)

client/package.json

@@ -3,9 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "build-dev": "NODE_ENV=development webpack --config webpack.dev.js",
+    "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
-    "watch": "NODE_ENV=development webpack --config webpack.dev.js --watch",
+    "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
-    "build-prod": "NODE_ENV=production webpack --config webpack.prod.js",
+    "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js",
     "lint": "eslint frontend/"
   },
   "dependencies": {