Skip to content

Commit

Permalink
Merge pull request #1065 from CraveFood/update-node
Browse files Browse the repository at this point in the history
Bump node version
  • Loading branch information
alcferreira authored Dec 29, 2021
2 parents 322169e + 7afd0c5 commit 3bc00b1
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 211 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ packages/*/.storybook
# coverage reports
coverage

# percy files
storybook-static

# misc
.DS_Store
npm-debug.log*
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12.1.0
v16.13.1
13 changes: 1 addition & 12 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
import React from "react";
import { createGlobalStyle, ThemeProvider } from "styled-components";
import {
configure,
addDecorator,
getStorybook,
setAddon,
} from "@storybook/react";
import createPercyAddon from "@percy-io/percy-storybook";

const { percyAddon, serializeStories } = createPercyAddon();
setAddon(percyAddon);
import { configure, addDecorator } from "@storybook/react";

const GlobalStyle = createGlobalStyle`
Expand Down Expand Up @@ -59,5 +50,3 @@ function withGlobalStyle(storyFn) {
}

addDecorator(withGlobalStyle);

serializeStories(getStorybook);
28 changes: 12 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,18 @@ after_success:
- git config user.email "[email protected]" || travis_terminate 1;
- git remote set-url origin https://${GH_TOKEN}@github.com/CraveFood/farmblocks.git || travis_terminate 1;
- |
if [ $TRAVIS_EVENT_TYPE == "cron" ]; then
yarn snapshot || travis_terminate 1;
if [ $BRANCH == "master" ]; then
yarn snyk || travis_terminate 1;
snyk monitor || travis_terminate 1;
lerna publish --yes || travis_terminate 1;
yarn build-storybook || travis_terminate 1;
git add docs;
git commit -m "chore(docs): [ci skip] gallery update";
git push origin "$BRANCH";
source ./bin/github_get_release_id.sh;
./bin/github_publish_release.sh;
else
if [ $BRANCH == "master" ]; then
yarn snyk || travis_terminate 1;
snyk monitor || travis_terminate 1;
lerna publish --yes || travis_terminate 1;
yarn build-storybook || travis_terminate 1;
git add docs;
git commit -m "chore(docs): [ci skip] gallery update";
git push origin "$BRANCH";
source ./bin/github_get_release_id.sh;
./bin/github_publish_release.sh;
else
if [ $TRAVIS_EVENT_TYPE == "push" ]; then
lerna publish --canary --yes --preid "alpha-$BRANCH-$TRAVIS_JOB_NUMBER" || travis_terminate 1;
fi
if [ $TRAVIS_EVENT_TYPE == "push" ]; then
lerna publish --canary --yes --preid "alpha-$BRANCH-$TRAVIS_JOB_NUMBER" || travis_terminate 1;
fi
fi
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"commit": "git-cz",
"storybook": "start-storybook -p 6006 -s .storybook/assets",
"build-storybook": "build-storybook -s .storybook/assets -o docs",
"create-component": "create-component",
"snapshot": "build-storybook -s .storybook/assets && percy-storybook --widths=1280"
"create-component": "create-component"
},
"workspaces": [
"packages/*"
Expand All @@ -42,7 +41,6 @@
"@babel/preset-react": "^7.13.13",
"@babel/runtime": "^7.13.10",
"@crave/farmblocks-dev-scaffold": "^1.2.0",
"@percy-io/percy-storybook": "^2.1.0",
"@storybook/addon-actions": "^5.3.19",
"@storybook/addon-docs": "^5.3.19",
"@storybook/addon-info": "^5.3.19",
Expand Down
Loading

0 comments on commit 3bc00b1

Please sign in to comment.