Skip to content

Commit

Permalink
Merge branch 'main' into 184-babel
Browse files Browse the repository at this point in the history
* main:
  chore: node minor dep upgrades (#188)
  docs: env variable with graphcdn
  fix bug in postheader loading wrong scss file

# Conflicts:
#	website/package.json
  • Loading branch information
ccorda committed Dec 27, 2021
2 parents 2164d98 + f9c196f commit 99ccd74
Show file tree
Hide file tree
Showing 5 changed files with 357 additions and 492 deletions.
6 changes: 4 additions & 2 deletions website/.env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ WORDPRESS_DOMAIN=bubsnext.wpengine.com
# When GraphCDN is used, it'll be a different URL
# than the Wordpress backend. Define it specifically here
# Including the preceding HTTPS
#WORDPRESS_API_URL=https://bubsnext.graphcdn.app
# WORDPRESS_API_URL=http://localhost:8000/graphql
# WORDPRESS_API_URL=https://bubsnext.wpengine.com/graphq
WORDPRESS_API_URL=https://bubsnext.graphcdn.app

# When GraphCDN is used, cache purging can be enabled
# whenever a Wordpress post is created or updated. Grab
Expand All @@ -22,7 +24,7 @@ WORDPRESS_DOMAIN=bubsnext.wpengine.com
#GRAPHCDN_PURGE_API_URL=https://admin.graphcdn.io/bubsnext

# Preview secret for localhosting only
HEADLESS_API_SECRET=bubs-next-headless-secret-key
# HEADLESS_API_SECRET=bubs-next-headless-secret-key

# Enable bundle analyzer
# ANALYZE=true
5 changes: 4 additions & 1 deletion website/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
"react/display-name": 1,

// React Hooks
"react-hooks/exhaustive-deps": "off"
"react-hooks/exhaustive-deps": "off",

// Next
"@next/next/no-page-custom-font": "off"
}
}
23 changes: 12 additions & 11 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,39 @@
"author": "Patronage.org",
"license": "private",
"dependencies": {
"@popperjs/core": "^2.10.2",
"@popperjs/core": "^2.11.0",
"bootstrap": "^5.1.3",
"classnames": "^2.3.1",
"dayjs": "^1.10.7",
"isomorphic-unfetch": "^3.1.0",
"next": "^12.0.4",
"next": "^12.0.7",
"next-seo": "^4.28.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-icons": "^4.3.1",
"sass": "^1.43.4",
"slugify": "^1.6.2",
"sass": "^1.45.1",
"slugify": "^1.6.4",
"widont": "^0.3.3"
},
"devDependencies": {
"@next/bundle-analyzer": "^12.0.4",
"@next/bundle-analyzer": "^12.0.7",
"babel-eslint": "^10.1.0",
"cross-env": "^7.0.3",
"eslint": "^8.5.0",
"eslint-config-next": "^12.0.4",
"eslint-config-next": "^12.0.7",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-react": "^7.27.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"husky": "^7.0.4",
"lint-staged": "^12.0.3",
"prettier": "^2.4.1",
"stylelint": "^14.1.0",
"lint-staged": "^12.1.4",
"prettier": "^2.5.1",
"stylelint": "^14.2.0",
"stylelint-config-idiomatic-order": "^8.1.0",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard-scss": "^3.0.0",
"stylelint-prettier": "^2.0.0",
"stylelint-scss": "^4.0.0"
"stylelint-scss": "^4.1.0"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": "eslint --fix",
Expand Down
2 changes: 1 addition & 1 deletion website/src/components/post/PostHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { parseISO, format } from 'date-fns';
import Link from 'next/link';
import React from 'react';
import * as widont from 'widont';
import styles from './PostFooter.module.scss';
import styles from './PostHeader.module.scss';

export function PostHeader({
title,
Expand Down
Loading

0 comments on commit 99ccd74

Please sign in to comment.