Skip to content

Commit

Permalink
Merge pull request #1283 from thematters/develop
Browse files Browse the repository at this point in the history
Release: v3.10.0
  • Loading branch information
robertu7 authored Jul 8, 2020
2 parents c7456cc + 2aa9a77 commit d08dc93
Show file tree
Hide file tree
Showing 16 changed files with 335 additions and 155 deletions.
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
region: ap-southeast-1
deployment_package: deploy.zip
use_existing_version_if_available: true
wait_for_deployment: false

# === `master` branch ===
- name: Upload Assets (production)
Expand Down
5 changes: 4 additions & 1 deletion bin/buildFragmentTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ const fs = require('fs')
const dotenv = require('dotenv')

// load environment variables from .env
const dotEnvResult = dotenv.config()
const dotEnvResult = dotenv.config({
path: '.env.dev'
})
if (dotEnvResult.error) {
console.error(dotEnvResult.error)
}


fetch(process.env.NEXT_PUBLIC_API_URL, {
method: 'POST',
headers: {
Expand Down
140 changes: 77 additions & 63 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "matters-web",
"version": "3.9.0",
"version": "3.10.0",
"description": "codebase of Matters' website",
"sideEffects": false,
"author": "",
Expand Down Expand Up @@ -39,9 +39,9 @@
"@reach/alert": "^0.10.5",
"@reach/dialog": "^0.10.5",
"@reach/visually-hidden": "^0.10.4",
"@sentry/browser": "^5.19.0",
"@sentry/browser": "^5.19.1",
"@stripe/react-stripe-js": "^1.1.2",
"@stripe/stripe-js": "^1.7.0",
"@stripe/stripe-js": "^1.8.0",
"@tippyjs/react": "^4.0.4",
"apollo-cache-inmemory": "^1.6.6",
"apollo-cache-persist": "^0.1.1",
Expand All @@ -59,14 +59,14 @@
"fingerprintjs2": "^2.1.0",
"firebase": "^7.15.5",
"formik": "^2.1.4",
"graphql": "^14.6.0",
"graphql": "^14.7.0",
"graphql-tag": "^2.10.3",
"helmet": "^3.23.3",
"isomorphic-unfetch": "^3.0.0",
"jump.js": "^1.0.2",
"lodash": "^4.17.15",
"next": "^9.4.4",
"next-with-apollo": "^5.0.1",
"next-with-apollo": "^5.1.0",
"nprogress": "^0.2.0",
"number-precision": "^1.5.0",
"path-to-regexp": "^6.1.0",
Expand All @@ -83,13 +83,13 @@
"react-virtualized": "^9.21.2",
"react-waypoint": "^9.0.3",
"subscriptions-transport-ws": "^0.9.16",
"use-debounce": "^3.4.2",
"use-debounce": "^3.4.3",
"validator": "^13.1.1"
},
"devDependencies": {
"@babel/plugin-proposal-optional-chaining": "^7.10.4",
"@svgr/webpack": "^5.4.0",
"@testing-library/react": "^10.4.3",
"@testing-library/react": "^10.4.4",
"@types/autosize": "^3.0.7",
"@types/classnames": "^2.2.10",
"@types/express": "^4.17.4",
Expand Down
1 change: 0 additions & 1 deletion src/common/enums/fileTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ export const ACCEPTED_UPLOAD_IMAGE_TYPES: string[] = [
'image/gif',
'image/png',
'image/jpeg',
'image/svg+xml',
'image/webp',
]

Expand Down
2 changes: 1 addition & 1 deletion src/common/gql/fragmentTypes.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"name": "Connection",
"possibleTypes": [
{ "name": "ArticleConnection" },
{ "name": "ResponseConnection" },
{ "name": "CommentConnection" },
{ "name": "ResponseConnection" },
{ "name": "TagConnection" },
{ "name": "UserConnection" },
{ "name": "DraftConnection" },
Expand Down
Loading

0 comments on commit d08dc93

Please sign in to comment.