Skip to content

Commit 3bc00b1

Browse files
authored
Merge pull request #1065 from CraveFood/update-node
Bump node version
2 parents 322169e + 7afd0c5 commit 3bc00b1

File tree

6 files changed

+26
-211
lines changed

6 files changed

+26
-211
lines changed

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ packages/*/.storybook
1010
# coverage reports
1111
coverage
1212

13-
# percy files
14-
storybook-static
15-
1613
# misc
1714
.DS_Store
1815
npm-debug.log*

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v12.1.0
1+
v16.13.1

.storybook/preview.js

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
import React from "react";
22
import { createGlobalStyle, ThemeProvider } from "styled-components";
3-
import {
4-
configure,
5-
addDecorator,
6-
getStorybook,
7-
setAddon,
8-
} from "@storybook/react";
9-
import createPercyAddon from "@percy-io/percy-storybook";
10-
11-
const { percyAddon, serializeStories } = createPercyAddon();
12-
setAddon(percyAddon);
3+
import { configure, addDecorator } from "@storybook/react";
134

145
const GlobalStyle = createGlobalStyle`
156
@@ -59,5 +50,3 @@ function withGlobalStyle(storyFn) {
5950
}
6051

6152
addDecorator(withGlobalStyle);
62-
63-
serializeStories(getStorybook);

.travis.yml

+12-16
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,18 @@ after_success:
2727
- git config user.email "[email protected]" || travis_terminate 1;
2828
- git remote set-url origin https://${GH_TOKEN}@github.com/CraveFood/farmblocks.git || travis_terminate 1;
2929
- |
30-
if [ $TRAVIS_EVENT_TYPE == "cron" ]; then
31-
yarn snapshot || travis_terminate 1;
30+
if [ $BRANCH == "master" ]; then
31+
yarn snyk || travis_terminate 1;
32+
snyk monitor || travis_terminate 1;
33+
lerna publish --yes || travis_terminate 1;
34+
yarn build-storybook || travis_terminate 1;
35+
git add docs;
36+
git commit -m "chore(docs): [ci skip] gallery update";
37+
git push origin "$BRANCH";
38+
source ./bin/github_get_release_id.sh;
39+
./bin/github_publish_release.sh;
3240
else
33-
if [ $BRANCH == "master" ]; then
34-
yarn snyk || travis_terminate 1;
35-
snyk monitor || travis_terminate 1;
36-
lerna publish --yes || travis_terminate 1;
37-
yarn build-storybook || travis_terminate 1;
38-
git add docs;
39-
git commit -m "chore(docs): [ci skip] gallery update";
40-
git push origin "$BRANCH";
41-
source ./bin/github_get_release_id.sh;
42-
./bin/github_publish_release.sh;
43-
else
44-
if [ $TRAVIS_EVENT_TYPE == "push" ]; then
45-
lerna publish --canary --yes --preid "alpha-$BRANCH-$TRAVIS_JOB_NUMBER" || travis_terminate 1;
46-
fi
41+
if [ $TRAVIS_EVENT_TYPE == "push" ]; then
42+
lerna publish --canary --yes --preid "alpha-$BRANCH-$TRAVIS_JOB_NUMBER" || travis_terminate 1;
4743
fi
4844
fi

package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"commit": "git-cz",
1818
"storybook": "start-storybook -p 6006 -s .storybook/assets",
1919
"build-storybook": "build-storybook -s .storybook/assets -o docs",
20-
"create-component": "create-component",
21-
"snapshot": "build-storybook -s .storybook/assets && percy-storybook --widths=1280"
20+
"create-component": "create-component"
2221
},
2322
"workspaces": [
2423
"packages/*"
@@ -42,7 +41,6 @@
4241
"@babel/preset-react": "^7.13.13",
4342
"@babel/runtime": "^7.13.10",
4443
"@crave/farmblocks-dev-scaffold": "^1.2.0",
45-
"@percy-io/percy-storybook": "^2.1.0",
4644
"@storybook/addon-actions": "^5.3.19",
4745
"@storybook/addon-docs": "^5.3.19",
4846
"@storybook/addon-info": "^5.3.19",

0 commit comments

Comments
 (0)