Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): Upgrade Gatsby to fix gatsby-announcer bug. #959

Merged
merged 3 commits into from
Jan 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 56 additions & 32 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ workflows:
main:
jobs:
- install_dependencies
- build:
- build_initial:
requires:
- install_dependencies
- lint:
Expand All @@ -17,18 +17,22 @@ workflows:
- test:
requires:
- install_dependencies
# - cypress_job:
# requires:
# - build
- semantic_release:
- full_build_and_deploy:
requires:
- build
- build_initial
- lint
- test
filters:
branches:
only:
- master
- semantic_release:
requires:
- full_build_and_deploy
filters:
branches:
only:
- master
- sentry_release:
requires:
- semantic_release
Expand All @@ -37,6 +41,10 @@ workflows:
only:
- master

# - cypress_job:
# requires:
# - build

# ===================
# Shared definitions.
# ===================
Expand Down Expand Up @@ -160,7 +168,7 @@ jobs:
name: Upload results to Codecov.
command: yarn codecov

build:
build_initial:
<<: *defaults
steps:
- checkout
Expand All @@ -174,34 +182,50 @@ jobs:
- *save_cache
- *save_public_dir_cache

# ---------------------------------------------------------------------------

push_image:
docker:
- image: docker:18-git
environment:
IMAGE_ID: 'jessestuart/jesses.io'
full_build_and_deploy:
<<: *defaults
steps:
- checkout
- setup_remote_docker
- run:
name: Authenticate with Docker Hub.
command: |
# Login to Docker Hub.
echo $DOCKERHUB_PASS | docker login -u $DOCKERHUB_USER --password-stdin
- run:
name: Build Docker image for static site.
command: |
docker build -t "${IMAGE_ID}" .
- *restore_cache
- *restore_public_dir_cache
- *install_dependencies
- *load_aws_credentials
- run:
name: Push image to ECR.
command: |
DATETIME_TAG="$(date -u +'%Y%m%d')-$(date -u +'%H%M%S')"
docker tag "${IMAGE_ID}" "${IMAGE_ID}:${DATETIME_TAG}"
docker push "${IMAGE_ID}:${DATETIME_TAG}"
if [ "${CIRCLE_BRANCH}" = 'master' ]; then
docker push "${IMAGE_ID}"
fi
name: Build static site. (with limited assets)
command: yarn build
- *save_cache
- *save_public_dir_cache
- run: yarn add global netlify-cli
- run: netlify deploy --dir=public

# ---------------------------------------------------------------------------

# push_image:
# docker:
# - image: docker:18-git
# environment:
# IMAGE_ID: 'jessestuart/jesses.io'
# steps:
# - checkout
# - setup_remote_docker
# - run:
# name: Authenticate with Docker Hub.
# command: |
# # Login to Docker Hub.
# echo $DOCKERHUB_PASS | docker login -u $DOCKERHUB_USER --password-stdin
# - run:
# name: Build Docker image for static site.
# command: |
# docker build -t "${IMAGE_ID}" .
# - run:
# name: Push image to ECR.
# command: |
# DATETIME_TAG="$(date -u +'%Y%m%d')-$(date -u +'%H%M%S')"
# docker tag "${IMAGE_ID}" "${IMAGE_ID}:${DATETIME_TAG}"
# docker push "${IMAGE_ID}:${DATETIME_TAG}"
# if [ "${CIRCLE_BRANCH}" = 'master' ]; then
# docker push "${IMAGE_ID}"
# fi

semantic_release: *semantic_release

Expand Down
1 change: 0 additions & 1 deletion gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const getSourceS3ConfigForEnvironment = env => {
return {
bucketName: 'js-photos-dev',
domain: 'minio.jesses.io',
protocol: 'http',
}
case GatsbyEnv.Staging: {
return { bucketName: 'js-photos-dev' }
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"bluebird": "3.7.2",
"classnames": "2.2.6",
"dotenv": "8.2.0",
"gatsby": "2.19.1",
"gatsby": "2.19.3",
"gatsby-image": "2.2.39",
"gatsby-link": "2.2.28",
"js-tachyons": "1.3.4",
Expand Down Expand Up @@ -176,6 +176,7 @@
"scripts": {
"build": "GATSBY_ENV=Production gatsby build",
"build:ci": "GATSBY_ENV=Staging gatsby build",
"build:dev": "GATSBY_ENV=Development gatsby build",
"check-types": "tsc -p tsconfig.json",
"clean": "rm -rf node_modules/ .cache/ && yarn -s",
"cloc": "cloc --vcs=git --by-file-by-lang --not-match-f=yarn.lock .",
Expand Down
2 changes: 2 additions & 0 deletions src/utils/presets.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* TODO: Remove this? */

const animation = {
curveDefault: 'cubic-bezier(0.4, 0, 0.2, 1)',
speedDefault: '300ms',
Expand Down
16 changes: 4 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9142,10 +9142,10 @@ gatsby-transformer-sharp@2.3.13:
semver "^5.7.1"
sharp "^0.23.4"

gatsby@2.19.1:
version "2.19.1"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-2.19.1.tgz#eaea19aec7580a459a7d2b9acea6e1445902ec36"
integrity sha512-n4GCNLIdG+0Kf6qNlIN4cfRp+PMAtN45RMvKoRFHQ5hDKnBZf53+wKe0CH2WhYtYayxit32Cn4usDqe5iASWag==
gatsby@2.19.3:
version "2.19.3"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-2.19.3.tgz#16b7e0f1067a05b12f52d5899cef14473cb02b81"
integrity sha512-jnJ4t3iejcoB+bujV55O1m5uiq19EF/Jq9cWO+M0OSbbPRl3qplDQCbKzhSOXXcoTb7k0jxPMdUOqQ53rX9vpA==
dependencies:
"@babel/code-frame" "^7.5.5"
"@babel/core" "^7.7.5"
Expand Down Expand Up @@ -14083,7 +14083,6 @@ npm@^6.10.3:
cmd-shim "^3.0.3"
columnify "~1.5.4"
config-chain "^1.1.12"
debuglog "*"
detect-indent "~5.0.0"
detect-newline "^2.1.0"
dezalgo "~1.0.3"
Expand All @@ -14098,7 +14097,6 @@ npm@^6.10.3:
has-unicode "~2.0.1"
hosted-git-info "^2.8.5"
iferr "^1.0.2"
imurmurhash "*"
infer-owner "^1.0.4"
inflight "~1.0.6"
inherits "^2.0.4"
Expand All @@ -14117,14 +14115,8 @@ npm@^6.10.3:
libnpx "^10.2.0"
lock-verify "^2.1.0"
lockfile "^1.0.4"
lodash._baseindexof "*"
lodash._baseuniq "~4.6.0"
lodash._bindcallback "*"
lodash._cacheindexof "*"
lodash._createcache "*"
lodash._getnative "*"
lodash.clonedeep "~4.5.0"
lodash.restparam "*"
lodash.union "~4.6.0"
lodash.uniq "~4.5.0"
lodash.without "~4.4.0"
Expand Down