Skip to content

Commit

Permalink
Merge pull request #117 from wwayne/deploy
Browse files Browse the repository at this point in the history
Improve deploy process
  • Loading branch information
wwayne authored Jun 17, 2016
2 parents 7da31ca + c67b906 commit a5be383
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 640 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@

# files
node_modules/
example/dist
example/dist/
dist/
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ CHANGELOG.md

// setting files
.babelrc
circle.yml
.travis.yml
11 changes: 1 addition & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ genStand:
@rm -rf $(STANDALONE) && mkdir $(STANDALONE)
@$(NODE_BIN)/browserify -t babelify -t browserify-shim $(SRC)/index.js --standalone ReactTooltip -o $(STANDALONE)/react-tooltip.js
@$(NODE_BIN)/browserify -t babelify -t browserify-shim $(SRC)/index.js --standalone ReactTooltip | $(NODE_BIN)/uglifyjs > $(STANDALONE)/react-tooltip.min.js
@cp $(DIST)/style.js $(STANDALONE)/style.js

devJS:
@$(NODE_BIN)/watchify -t babelify $(EXAMPLE_SRC)/index.js -o $(EXAMPLE_DIST)/index.js -dv
Expand All @@ -46,20 +45,12 @@ dev:

deployJS:
@echo Generating deploy JS files...
@$(NODE_BIN)/babel $(SRC)/index.js -o $(DIST)/react-tooltip.js
@$(NODE_BIN)/babel $(SRC)/style.js -o $(DIST)/style.js
@$(NODE_BIN)/babel $(SRC)/index.js | $(NODE_BIN)/uglifyjs > $(DIST)/react-tooltip.min.js

deployCSS:
@echo Generating deploy CSS files...
@cp $(SRC)/index.scss $(DIST)/react-tooltip.scss
@$(NODE_BIN)/node-sass --output-style compressed $(SRC)/index.scss $(DIST)/react-tooltip.min.css
@$(NODE_BIN)/babel $(SRC) --out-dir $(DIST)

deploy: lint
@echo Deploy...
@rm -rf dist && mkdir dist
@make convertCSS
@make deployCSS
@make deployJS
@make genStand
@echo success!
Expand Down
Loading

0 comments on commit a5be383

Please sign in to comment.