Skip to content

Commit

Permalink
Merge branch 'frontend/refactor/remove-storybook' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
aapeliv committed Dec 31, 2024
2 parents 50cb748 + 8c110b7 commit 5fbc67d
Show file tree
Hide file tree
Showing 114 changed files with 211 additions and 11,612 deletions.
1 change: 0 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ If you need help with any of these, please ask :)
- [ ] Formatted my code with `yarn format`
- [ ] There are no warnings from `yarn lint --fix`
- [ ] There are no console warnings when running the app
- [ ] Added any new components to storybook
- [ ] Added tests where relevant
- [ ] All tests pass
- [ ] Clicked around my changes running locally and it works
Expand Down
47 changes: 0 additions & 47 deletions app/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,28 +380,6 @@ test:web-linting:
changes:
- app/web/**/*

test:storybook:
needs: ["build:web-dev"]
stage: test
image: $WEB_DEV_TAG
inherit:
# no docker login
default: false
script:
- cd /app && yarn build-storybook
- mkdir -p $CI_PROJECT_DIR/artifacts/storybook-static && cp -a /app/storybook-static $CI_PROJECT_DIR/artifacts/
artifacts:
paths:
- artifacts/storybook-static
rules:
- if: ($BUILD_WEB == "true") && ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH == $RELEASE_BRANCH)
changes:
- app/**/*
- if: ($BUILD_WEB == "true") && ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH != $RELEASE_BRANCH)
changes:
- app/proto/**/*
- app/web/**/*

test:proxy:
needs: ["build:proxy"]
stage: test
Expand Down Expand Up @@ -471,28 +449,6 @@ preview:wcov:
- app/proto/**/*
- app/web/**/*

preview:storybook:
needs: ["test:storybook"]
stage: preview
image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
inherit:
# no docker login
default: false
script:
- aws s3 rm s3://$AWS_PREVIEW_BUCKET/storybook/$CI_COMMIT_SHORT_SHA/ --recursive
- aws s3 cp artifacts/storybook-static s3://$AWS_PREVIEW_BUCKET/storybook/$CI_COMMIT_SHORT_SHA/ --recursive
- aws s3 rm s3://$AWS_PREVIEW_BUCKET/storybook/$CI_COMMIT_REF_SLUG/ --recursive
- aws s3 cp artifacts/storybook-static s3://$AWS_PREVIEW_BUCKET/storybook/$CI_COMMIT_REF_SLUG/ --recursive
- echo "Done, storybook available at https://$CI_COMMIT_SHORT_SHA--storybook.$PREVIEW_DOMAIN/ and https://$CI_COMMIT_REF_SLUG--storybook.$PREVIEW_DOMAIN/"
rules:
- if: ($BUILD_WEB == "true") && ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH == $RELEASE_BRANCH)
changes:
- app/**/*
- if: ($BUILD_WEB == "true") && ($DO_CHECKS == "true") && ($CI_COMMIT_BRANCH != $RELEASE_BRANCH)
changes:
- app/proto/**/*
- app/web/**/*

preview:web:
needs: ["build:web"]
stage: preview
Expand Down Expand Up @@ -630,9 +586,6 @@ wait:before-release:
- job: test:web-linting
artifacts: false
optional: true
- job: test:storybook
artifacts: false
optional: true

release:proxy:
needs: ["wait:before-release"]
Expand Down
14 changes: 1 addition & 13 deletions app/web/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"plugin:@typescript-eslint/recommended",
"next",
"next/core-web-vitals",
"plugin:storybook/recommended",
"prettier"
],
"plugins": ["@typescript-eslint", "simple-import-sort", "unused-imports"],
Expand Down Expand Up @@ -38,22 +37,11 @@
"@typescript-eslint/no-non-null-assertion": "off",
//used in testing
"@typescript-eslint/no-empty-function": "off",
//don't care about this that much
"storybook/prefer-pascal-case": "off",
//not using this right now
"@next/next/no-img-element": "off",
//this is ugly
"react/no-unescaped-entities": "off",
// Prefer inferred types so that the code is as close to JS as possible
"@typescript-eslint/explicit-module-boundary-types": "off"
},
"overrides": [
//allow any in stories
{
"files": ["**/*.stories.tsx"],
"rules": {
"@typescript-eslint/no-explicit-any": "off"
}
}
]
}
}
2 changes: 0 additions & 2 deletions app/web/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ yarn-error.log*

proto/**

storybook-static/

junit.xml


Expand Down
3 changes: 0 additions & 3 deletions app/web/.storybook/fsMock.js

This file was deleted.

40 changes: 0 additions & 40 deletions app/web/.storybook/i18n.ts

This file was deleted.

37 changes: 0 additions & 37 deletions app/web/.storybook/main.js

This file was deleted.

49 changes: 0 additions & 49 deletions app/web/.storybook/preview.js

This file was deleted.

9 changes: 0 additions & 9 deletions app/web/.storybook/reset.css

This file was deleted.

30 changes: 0 additions & 30 deletions app/web/components/Actions/Actions.stories.tsx

This file was deleted.

23 changes: 0 additions & 23 deletions app/web/components/Alert.stories.tsx

This file was deleted.

35 changes: 0 additions & 35 deletions app/web/components/Autocomplete.stories.tsx

This file was deleted.

Loading

0 comments on commit 5fbc67d

Please sign in to comment.