thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

use relative paths to node bin scripts, removing npx

Browse source
This commit is contained in:
silverwind 2019-05-15 18:50:14 +02:00
parent 3ebbfb1036
commit 119b725525
No known key found for this signature in database
GPG key ID: 2E62B41C93869443
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -21,6 +21,7 @@ endif
BINDATA := modules/{options,public,templates}/bindata.go BINDATA := modules/{options,public,templates}/bindata.go
GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go") GOFILES := $(shell find . -name "*.go" -type f ! -path "./vendor/*" ! -path "*/bindata.go")
GOFMT ?= gofmt -s GOFMT ?= gofmt -s
NODE_BIN := $(PWD)/node_modules/.bin
GOFLAGS := -i -v GOFLAGS := -i -v
EXTRA_GOFLAGS ?= EXTRA_GOFLAGS ?=
@ -367,22 +368,24 @@ release-compress:
.PHONY: js .PHONY: js
js: js:
@hash npx > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @if ([ ! -d "$(NODE_BIN)" ]); then \
echo "Please install npm version 5.2+"; \ echo "node_modules directory is absent, please run 'npm install' first"; \
exit 1; \ exit 1; \
fi; fi;
npx eslint public/js
$(NODE_BIN)/eslint public/js
.PHONY: css .PHONY: css
css: css:
@hash npx > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @if ([ ! -d "$(NODE_BIN)" ]); then \
echo "Please install npm version 5.2+"; \ echo "node_modules directory is absent, please run 'npm install' first"; \
exit 1; \ exit 1; \
fi; fi;
npx lesshint public/less/
npx -p less lessc --clean-css="--s0 -b" public/less/index.less public/css/index.css $(NODE_BIN)/lesshint public/less/
$(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),npx -p less lessc --clean-css="--s0 -b" public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;) $(NODE_BIN)/lessc --clean-css="--s0 -b" public/less/index.less public/css/index.css
npx postcss --use autoprefixer --no-map --replace public/css/* $(foreach file, $(filter-out public/less/themes/_base.less, $(wildcard public/less/themes/*)),$(NODE_BIN)/lessc --clean-css="--s0 -b" public/less/themes/$(notdir $(file)) > public/css/theme-$(notdir $(call strip-suffix,$(file))).css;)
$(NODE_BIN)/postcss --use autoprefixer --no-map --replace public/css/*
@diff=$$(git diff public/css/*); \ @diff=$$(git diff public/css/*); \
if ([ ! -z "$CI" ] && [ -n "$$diff" ]); then \ if ([ ! -z "$CI" ] && [ -n "$$diff" ]); then \