Skip to content

Commit 323fb84

Browse files
committed
chore: Fix deployment, fix security issues in dependencies
1 parent b2fd1dd commit 323fb84

File tree

4 files changed

+199
-197
lines changed

4 files changed

+199
-197
lines changed

.travis.yml

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,37 @@
11
language: node_js
22
node_js:
3-
- "12"
3+
- "lts/*"
44
cache: yarn
5-
deploy:
6-
local_dir: .docs
7-
provider: pages
8-
skip_cleanup: true
9-
github_token: $GITHUB_TOKEN # Set on travis-ci.org dashboard
10-
on:
11-
branch: master
12-
condition: '"$TRAVIS_JOB_NUMBER" == *.1'
13-
script:
14-
- "(yarn lint && yarn test --ci --coverage) || travis_terminate"
15-
- 'if [[ "$TRAVIS_JOB_NUMBER" == *.1 ]]; then yarn build:storybook || travis_terminate 1; fi'
16-
- yarn release
17-
after_success:
18-
- bash <(curl -s https://codecov.io/bash)
5+
stages:
6+
- test
7+
- name: deploy
8+
if: branch = master
9+
- name: release
10+
if: branch = master AND type != pull_request
11+
jobs:
12+
include:
13+
- stage: test
14+
script:
15+
- yarn lint
16+
- yarn test --ci --coverage
17+
after_success:
18+
- bash <(curl -s https://codecov.io/bash)
19+
- stage: deploy
20+
script:
21+
- yarn build
22+
- yarn build:storybook
23+
deploy:
24+
local_dir: .docs
25+
provider: pages
26+
skip_cleanup: true
27+
github_token: $GH_TOKEN
28+
on:
29+
branch: master
30+
- stage: release
31+
script: skip
32+
deploy:
33+
provider: script
34+
skip_cleanup: true
35+
script: yarn release
36+
on:
37+
branch: master

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017 @researchgate/react-intersection-list authors
3+
Copyright (c) @researchgate/react-intersection-list authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@
6868
"testURL": "http://localhost/"
6969
},
7070
"prettier": "@researchgate/prettier-config",
71-
"resolutions": {
72-
"serialize-javascript": "3.1.0"
73-
},
7471
"spire": {
7572
"extends": [
7673
[

0 commit comments

Comments
 (0)