Skip to content

Commit b2f530f

Browse files
authored
Merge pull request #155 from citizennet/fix-parcel-SemVer
Fix parcel SemVer error
2 parents 637d460 + 8fcb042 commit b2f530f

File tree

3 files changed

+430
-62
lines changed

3 files changed

+430
-62
lines changed

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ROOT_DIR ?= $(shell pwd)
33
BUILD_DIR ?= $(ROOT_DIR)/.build
44
DIST_DIR ?= $(ROOT_DIR)/dist
55
OUTPUT_DIR ?= $(ROOT_DIR)/output
6+
PARCEL_DIR ?= $(BUILD_DIR)/parcel
67
RTS_ARGS ?=
78
UI_GUIDE_DIR ?= $(ROOT_DIR)/ui-guide
89

@@ -20,14 +21,14 @@ YARN := cd $(ROOT_DIR) && yarn
2021

2122
.DEFAULT_GOAL := build
2223

23-
$(BUILD_DIR) $(DIST_DIR):
24+
$(BUILD_DIR) $(DIST_DIR) $(PARCEL_DIR):
2425
mkdir -p $@
2526

2627
$(DEPS): packages.dhall spago.dhall $(NODE_MODULES) | $(BUILD_DIR)
2728
$(YARN) run spago install $(RTS_ARGS)
2829
touch $@
2930

30-
$(DIST_DIR)/bundled.js: $(OUTPUT_DIR)/Main/index.js
31+
$(DIST_DIR)/bundled.js: $(OUTPUT_DIR)/Main/index.js
3132
$(YARN) run purs bundle $(OUTPUT_DIR)/*/*.js \
3233
--main Main \
3334
--module Main \
@@ -59,3 +60,7 @@ clean: $(CLEAN_DEPS)
5960
$(OUTPUT_DIR) \
6061
$(ROOT_DIR)/.spago \
6162
$(ROOT_DIR)/node_modules
63+
64+
.PHONY: ui-guide
65+
ui-guide: build-css $(OUTPUT_DIR)/Main/index.js $(NODE_MODULES) | $(PARCEL_DIR)
66+
npx parcel $(DIST_DIR)/parcel.html --out-dir $(PARCEL_DIR) --no-cache

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"devDependencies": {
1313
"browserify": "^16.5.1",
1414
"parcel": "1.12.4",
15+
"parcel-bundler": "1.12.3",
1516
"purescript": "^0.13.8",
1617
"spago": "^0.15.2"
1718
},

0 commit comments

Comments
 (0)