Skip to content

Commit

Permalink
Fixed trigging of rebuild on webpack config change
Browse files Browse the repository at this point in the history
  • Loading branch information
squidfunk committed Feb 2, 2020
1 parent 2025881 commit 9b9527f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ lint:
# Start development server
start:
@ NODE_ENV=development ${BIN}/nodemon --quiet \
--watch src --ext html,scss,ts,tsx \
--watch . --watch src --ext html,scss,ts,tsx \
--exec make build

# -----------------------------------------------------------------------------
Expand Down Expand Up @@ -111,19 +111,19 @@ material/assets/javascripts/lunr: ${SCRIPT_LUNR} | $$(@D)/.

# Scripts
SCRIPT = src/assets/javascripts/index.ts
SCRIPT_PARTIALS = $(shell find src -name "*.ts*")
SCRIPT_SOURCES = $(shell find src -name "*.ts*") webpack.config.ts
material/assets/javascripts: $$@/lunr material/assets/javascripts/bundle.js
material/assets/javascripts/bundle.js: ${SCRIPT} ${SCRIPT_PARTIALS} | $$(@D)/.
material/assets/javascripts/bundle.js: ${SCRIPT} ${SCRIPT_SOURCES} | $$(@D)/.
@ echo "+ $@"
@ ${BIN}/webpack --mode production

# -----------------------------------------------------------------------------

# Stylesheets
STYLESHEETS = $(subst src,material,$(wildcard src/assets/stylesheets/a*.scss))
STYLESHEETS_PARTIALS = $(shell find src -name "_*.scss")
STYLESHEETS_SOURCES = $(shell find src -name "_*.scss")
material/assets/stylesheets: $(patsubst %.scss,%.css,${STYLESHEETS})
material/%.css: src/%.scss ${STYLESHEETS_PARTIALS} | $$(@D)/.
material/%.css: src/%.scss ${STYLESHEETS_SOURCES} | $$(@D)/.
@ echo "+ $@"
@ ${BIN}/node-sass -q \
--source-map $@.map \
Expand Down

0 comments on commit 9b9527f

Please sign in to comment.