Merge pull request #259 from citizennet/wenbo/FBCM-5353/add-outbrain-icon

FBCM-5353 Add Outbrain Icon

Author: boygao1992

Makefile

@@ -21,7 +21,7 @@ PURS_TIDY ?= purs-tidy
 SRC_FILES := $(shell find $(SRC_DIR) $(FIND_SRC_FILES_ARGS))
 TEST_FILES := $(shell find $(TEST_DIR) $(FIND_SRC_FILES_ARGS))
 UI_GUIDE_FILES := $(shell find $(UI_GUIDE_DIR) $(FIND_SRC_FILES_ARGS))
-YARN_LOCK := $(ROOT_DIR)/yarn.lock
+PACKAGE_LOCK := $(ROOT_DIR)/package-lock.json
 
 FORMAT_SRC_PURS_TIDY_STAMP := $(BUILD_DIR)/.format-src-purs-tidy-stamp
 FORMAT_TEST_PURS_TIDY_STAMP := $(BUILD_DIR)/.format-test-purs-tidy-stamp
@@ -88,8 +88,8 @@ $(FORMAT_TEST_PURS_TIDY_STAMP): $(TEST_FILES) $(NODE_MODULES_STAMP) | $(BUILD)
 	$(PURS_TIDY) $(PURS_TIDY_CMD) $(TEST_DIR)
 	@touch $@
 
-$(NODE_MODULES): $(PACKAGE_JSON) $(YARN_LOCK)
-	$(NPX) yarn install
+$(NODE_MODULES): $(PACKAGE_JSON) $(PACKAGE_LOCK)
+	npm install
 	touch $@
 
 $(OUTPUT_DIR)/Main/index.js: $(DEPS) $(SRC_FILES) $(UI_GUIDE_FILES)
@@ -145,6 +145,6 @@ help: $(BUILD_DIR)/help ## Display this help message
 .PHONY: test
 test: $(BUILD_DIR)/test.out ## Build and run tests
 
-.PHONY: ui-guide
-ui-guide: build-css $(OUTPUT_DIR)/Main/index.js $(NODE_MODULES) | $(PARCEL_DIR) ## Build the UI Guide using ParcelJS for hot reloading (experimental, may not work on all environments)
+.PHONY: ui-guide-local
+ui-guide-local: build-css $(OUTPUT_DIR)/Main/index.js $(NODE_MODULES) | $(PARCEL_DIR) ## Build the UI Guide using ParcelJS for hot reloading (experimental, may not work on all environments)
 	npx parcel serve $(DIST_DIR)/parcel.html --dist-dir $(PARCEL_DIR) --no-cache

css/Makefile

@@ -7,13 +7,14 @@ DIST_DIR ?= $(ROOT_DIR)/dist
 CSS_SRC := $(CSS_DIR)/src/*
 CSS_NODE_MODULES := $(CSS_DIR)/node_modules/.stamp
 CSS_PACKAGE_JSON := $(CSS_DIR)/package.json
-CSS_YARN_LOCK := $(CSS_DIR)/yarn.lock
+CSS_PACKAGE_LOCK := $(CSS_DIR)/package-lock.json
 DIST_CSS_FILENAME := cn-tailwind
 DIST_CSS_DEV_GLOBAL := $(DIST_DIR)/$(DIST_CSS_FILENAME).css
 DIST_CSS_DEV_SCOPED := $(DIST_DIR)/$(DIST_CSS_FILENAME).scoped.css
 DIST_CSS_PROD_GLOBAL := $(DIST_DIR)/$(DIST_CSS_FILENAME).min.css
 DIST_CSS_PROD_SCOPED := $(DIST_DIR)/$(DIST_CSS_FILENAME).scoped.min.css
 
+CSS_NPM := cd $(CSS_DIR) && npm
 CSS_NPX := cd $(CSS_DIR) && npx
 
 .DEFAULT_GOAL := build-css
@@ -23,8 +24,8 @@ CSS_NPX := cd $(CSS_DIR) && npx
 BUILD_DEPS += build-css
 CLEAN_DEPS += clean-css
 
-$(CSS_NODE_MODULES): $(CSS_PACKAGE_JSON) $(CSS_YARN_LOCK)
-	$(CSS_NPX) yarn install
+$(CSS_NODE_MODULES): $(CSS_PACKAGE_JSON) $(CSS_PACKAGE_LOCK)
+	$(CSS_NPM) install
 	touch $@
 
 $(DIST_CSS_DEV_GLOBAL): $(CSS_SRC) $(CSS_NODE_MODULES) | $(DIST_DIR)