Skip to content
This repository was archived by the owner on Feb 27, 2024. It is now read-only.

Commit 89e4387

Browse files
committed
Merge branch 'staging' into develop
2 parents e91e3b7 + a22554d commit 89e4387

23 files changed

+348
-314
lines changed

.env.sample

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Learn more about ENV variables at https://github.com/WebDevStudios/nextjs-wordpress-starter/wiki
2+
13
# Tells next.js we're in development mode
24
VERCEL_ENV="development"
35

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// https://eslint.org/docs/user-guide/configuring/
12
module.exports = {
23
parserOptions: {
34
ecmaFeatures: {

.github/CONTRIBUTING.md

Lines changed: 65 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,65 @@
1-
# Thanks for contributing — you rock! 🤘 <!-- omit in toc -->
1+
# Contributing <!-- omit in toc -->
22

3+
## Introduction
4+
5+
Thanks for contributing — you rock! 🤘
6+
7+
Before getting started, please [view the wiki](https://github.com/WebDevStudios/nextjs-wordpress-starter/wiki) and read the following documentation.
8+
9+
---
10+
11+
## Table of Contents <!-- omit in toc -->
12+
13+
- [Introduction](#introduction)
14+
- [Submitting Issues and Feature Requests](#submitting-issues-and-feature-requests)
315
- [Development](#development)
4-
- [Git Workflow](#git-workflow)
5-
- [Deployments](#deployments)
6-
- [Storybook](#storybook)
7-
- [Coding standards](#coding-standards)
816
- [Tips to help your PR get approved](#tips-to-help-your-pr-get-approved)
9-
- [Submitting bug reports and feature requests](#submitting-bug-reports-and-feature-requests)
17+
- [Git Workflow](#git-workflow)
18+
- [PR Preview Deployments](#pr-preview-deployments)
19+
- [Code Linting](#code-linting)
20+
- [Storybook](#storybook)
21+
- [Releases](#releases)
22+
23+
---
24+
25+
## Submitting Issues and Feature Requests
26+
27+
Before submitting an issue or making a feature request, please search for existing [issues](https://github.com/WebDevStudios/nextjs-wordpress-starter/issues) or look at our [Github Discussions](https://github.com/WebDevStudios/nextjs-wordpress-starter/discussions).
28+
29+
If you do file an issue, be sure to fill out the report completely!
30+
31+
---
1032

1133
## Development
1234

35+
### Tips to help your PR get approved
36+
37+
1. Make sure your code editor supports real-time linting and has the [recommended extensions](https://github.com/WebDevStudios/nextjs-wordpress-starter/wiki/recommended-extensions) installed
38+
2. [JSDocs](https://jsdoc.app/) are required for all JavaScript functions
39+
3. Run `yarn build && yarn start` before submitting your PR, to ensure a build will be successful
40+
4. Be courteous in your communications
41+
1342
### Git Workflow
1443

1544
1. Create a `feature` branch off `staging`
16-
2. Work locally adhereing to coding standards
45+
2. Work locally adhering to coding standards
1746
3. When ready, open a draft Pull Request on Github
1847
4. When finished, fill out the PR template and publish your PR
1948
5. Your PR must pass assertions and deploy successfully
2049
6. After peer review, the PR will be merged back into `staging`
2150
7. Repeat ♻️
2251

23-
### Deployments
52+
### PR Preview Deployments
2453

25-
[Vercel](https://nextjs-wordpress-starter-gregrickaby.webdevstudios.vercel.app) is connected to this Github repository and will automatically build and deploy. Learn more about [Vercel + Github integration](https://vercel.com/docs/git/vercel-for-github).
54+
[Vercel](https://vercel.com/webdevstudios/nextjs-wordpress-starter) is connected to this Github repository and will automatically build and deploy a unique URL for each Pull Request.
2655

27-
### Storybook
56+
Learn more about [Vercel + Github integration](https://vercel.com/docs/git/vercel-for-github).
2857

29-
To work with Storybook on your Local, run the following command:
58+
### Code Linting
3059

31-
```bash
32-
yarn storybook
33-
```
60+
This project has several rulesets and uses ESLint, Prettier, and Stylelint to enforce standards.
3461

35-
Stories are written in `.mdx` and should be placed next to the component. Learn more about [Storybook](https://storybook.js.org/).
36-
37-
## Coding standards
38-
39-
Pull requests _must pass_ all assertions and component changes will be reviewed in Chromatic prior to consideration.
40-
41-
### Tips to help your PR get approved
42-
43-
1. Make sure your code editor supports real-time linting.
44-
2. JSDocs are important and must be completely filled out.
45-
3. Run `yarn build && yarn start` before submitting your PR, to ensure a build will be successful
46-
4. Be courteous
47-
48-
In addition to real-time linting, you could run the following commands in your terminal (these commands are also used by Husky during a commit!)
62+
In addition to real-time linting, you could run the following commands in your terminal. These commands are also used by Husky during a commit!
4963

5064
Lint JavaScript:
5165

@@ -65,8 +79,28 @@ Format your code:
6579
yarn run format
6680
```
6781

68-
## Submitting bug reports and feature requests
82+
## Storybook
6983

70-
Before submitting an issue or making a feature request, please search for existing [issues](https://github.com/WebDevStudios/nextjs-wordpress-starter/issues) or look at our [Github Discussions](https://github.com/WebDevStudios/nextjs-wordpress-starter/discussions).
84+
To work with Storybook on your Local, run the following command:
85+
86+
```bash
87+
yarn storybook
88+
```
89+
90+
Stories are written in `.mdx` and should be placed next to the component.
91+
92+
[Learn how to write stories for this starter](https://github.com/WebDevStudios/nextjs-wordpress-starter/wiki/component-story).
93+
94+
---
95+
96+
## Releases
97+
98+
Releases to Production will occur at the end of a bi-weekly sprint or via `hotfixes` as needed.
99+
100+
1. On Github, create a PR off the `/staging` branch against the `/main` branch
101+
2. Copy the WPE Staging environment to WPE Production.
102+
3. On Github, merge `/staging` into `/main`
103+
104+
[Learn how to copy environments on WP Engine.](https://github.com/WebDevStudios/nextjs-wordpress-starter/wiki/Internal-Documentation#copy-wp-engine-environments)
71105

72-
If you do fill out a bug report, be sure to fill out the report completely!
106+
---

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
12

.vscode/settings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,13 @@
1111
// This will get emmet working in JSX.
1212
"emmet.includeLanguages": {
1313
"javascript": "javascriptreact"
14+
},
15+
16+
// 🔥 WebDevStudios - Your Success Is Our Mission. 🌮
17+
"workbench.colorCustomizations": {
18+
"titleBar.activeForeground": "#3f4040",
19+
"titleBar.inactiveForeground": "#3f4040CC",
20+
"titleBar.activeBackground": "#F3713C",
21+
"titleBar.inactiveBackground": "#F3713CCC"
1422
}
1523
}

0 commit comments

Comments
 (0)