Skip to content

Commit a4fe58d

Browse files
committed
Makefile example page build issues resolution
1 parent a90d539 commit a4fe58d

File tree

12 files changed

+3340
-1925
lines changed

12 files changed

+3340
-1925
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ cache:
33
directories:
44
- node_modules
55
node_js:
6-
- "8"
6+
- 12
77
notifications:
88
email:
99
recipients:
1010
- aron.helser@kitware.com
1111
on_success: change
1212
on_failure: always
1313
install:
14-
- npm install
14+
- yarn
1515

1616
script:
17-
- npm run build
17+
- yarn build
1818
- git config --global user.name "Travis CI"
1919
- git config --global user.email "aron.helser@kitware.com"
2020
- export GIT_PUBLISH_URL=https://${GH_TOKEN}@github.com/wwayne/react-tooltip.git
21-
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then npm run gh-pages -- --repo ${GIT_PUBLISH_URL}; fi
21+
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then yarn gh-pages -- --repo ${GIT_PUBLISH_URL}; fi
2222

2323
after_success:
24-
- npm run semantic-release
24+
- yarn semantic-release
2525

2626
branches:
2727
except:
28-
- "/^v\\d+\\.\\d+\\.\\d+$/"
28+
- "/^v\\d+\\.\\d+\\.\\d+$/"

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ EXAMPLE_SRC = example/src
44
STANDALONE = standalone
55
SRC = src
66
DIST = dist
7-
TEST = test/*.test.js
7+
TEST = test/*.spec.js
88
MOCHA_OPTS = --compilers js:babel-core/register --require test/setup.js -b --timeout 20000 --reporter spec
99

1010
lint:
@@ -30,7 +30,7 @@ devCSS:
3030
@$(NODE_BIN)/node-sass -w $(EXAMPLE_SRC)/index.scss $(EXAMPLE_DIST)/index.css
3131

3232
deployExample:
33-
@$(NODE_BIN)/browserify -t babelify $(EXAMPLE_SRC)/index.js -o $(EXAMPLE_DIST)/index.js -dv
33+
@$(NODE_BIN)/browserify -t [ babelify --presets [@babel/preset-env @babel/react] ] $(EXAMPLE_SRC)/index.js -o $(EXAMPLE_DIST)/index.js -dv
3434
@$(NODE_BIN)/node-sass $(EXAMPLE_SRC)/index.scss $(EXAMPLE_DIST)/index.css
3535
@$(NODE_BIN)/node-sass $(SRC)/index.scss $(EXAMPLE_DIST)/style.css
3636

@@ -53,9 +53,9 @@ deploy: lint
5353
@echo Deploy...
5454
@rm -rf dist && mkdir dist
5555
@rm -rf $(EXAMPLE_DIST) && mkdir -p $(EXAMPLE_DIST)
56+
@make deployJS
5657
@make deployExample
5758
@make convertCSS
58-
@make deployJS
5959
@make genStand
6060
@echo success!
6161

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ className | data-class | String | | extra custom class, can use !importan
7272
border | data-border | Bool | true, false | Add one pixel white border
7373
textColor | data-text-color | String | e.g. red | Popup text color
7474
backgroundColor | data-background-color | String | e.g. yellow | Popup background color
75-
arrowColor | data-arrow-color | String | e.g. #fff | Popup arrow color - if not specified, will use the *backgroundColor* value
75+
arrowColor | data-arrow-color | String | e.g. #fff | Popup arrow color - if not specified, will use the `backgroundColor` value
7676
getContent | null | Func or Array | (dataTip) => {}, [(dataTip) => {}, Interval] | Generate the tip content dynamically
7777
afterShow | null | Func | (evt) => {} | Function that will be called after tooltip show, with event that triggered show
7878
afterHide | null | Func | (evt) => {} | Function that will be called after tooltip hide, with event that triggered hide

0 commit comments

Comments
 (0)