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

[pull] master from segmentio:master #28

Merged
merged 4 commits into from
Aug 3, 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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
test:
working_directory: ~/evergreen
docker:
- image: circleci/node:10
- image: circleci/node:10.18
steps:
- checkout

Expand Down
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.mdx]
trim_trailing_whitespace = false
13 changes: 6 additions & 7 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ about: Report a bug to help us improve Evergreen
title: ''
labels: 'Type: Bug'
assignees: ''

---

<!---
---<!---

Hello! And thanks for contributing to Evergreen 🎉

Expand All @@ -25,6 +22,7 @@ A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Use component/props '...'
2. Click on '....'
3. See error
Expand All @@ -41,9 +39,10 @@ e.g. v4.24.1
If applicable, add screenshots to help explain your problem.

**Environment (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
5 changes: 1 addition & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ about: Suggest an idea for Evergreen
title: ''
labels: 'Type: Improvement'
assignees: ''

---

<!---
---<!---

Hello! And thanks for contributing to Evergreen 🎉

Expand Down
17 changes: 9 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
# 🎉 Thanks for taking the time to contribute to 🌲Evergreen! 🎉

It is highly appreciated that you take the time to help improve Evergreen.
Expand All @@ -17,13 +17,14 @@ Please respect our Code of Conduct, in short:
- Gracefully accepting constructive criticism.
- Focusing on what is best for the community.
- Showing empathy towards other community members.
-->
## Overview
## Screenshots (if applicable)
-->

## Overview

## Screenshots (if applicable)

## Testing
- [ ] Updated Typescript types and/or component PropTypes
- [ ] Added / modified component docs

- [ ] Updated Typescript types and/or component PropTypes
- [ ] Added / modified component docs
- [ ] Added / modified Storybook stories
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ node_modules
/npm-shrinkwrap.json
/package-lock.json
/.idea/
/storybook-static/
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
10.18
3 changes: 0 additions & 3 deletions .storybook/addons.js

This file was deleted.

74 changes: 0 additions & 74 deletions .storybook/config.js

This file was deleted.

4 changes: 4 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
stories: ['../**/*.stories.js'],
addons: ['@storybook/addon-actions', '@storybook/addon-links']
}
8 changes: 8 additions & 0 deletions .storybook/manager.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { addons } from '@storybook/addons'
import theme from './theme'

addons.setConfig({
theme,
/** Whether or not to show the add-on panel by default */
showPanel: false
})
14 changes: 0 additions & 14 deletions .storybook/requireStories.js

This file was deleted.

8 changes: 8 additions & 0 deletions .storybook/theme.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { create } from '@storybook/theming/create'

export default create({
base: 'light',

brandTitle: '🌲 Evergreen',
brandUrl: 'https://github.com/segmentio/evergreen'
})
6 changes: 1 addition & 5 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const webpack = require('webpack')

module.exports = storybookBaseConfig => {
module.exports = ({ config: storybookBaseConfig }) => {
// Return the altered config
return {
...storybookBaseConfig,
Expand All @@ -21,10 +21,6 @@ module.exports = storybookBaseConfig => {
{
test: /\.(blob)/,
loader: 'file-loader'
},
{
test: /\.(json)/,
loader: 'json-loader'
}
]
}
Expand Down
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"eslint.enable": false,
"xo.enable": true
"files.associations": {
"**/src/*.js": "javascriptreact"
}
}
17 changes: 17 additions & 0 deletions codemods/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "evergreen-ui-codemods",
"version": "5.0.0",
"description": "Codemods for evergreen-ui",
"repository": "segmentio/evergreen",
"license": "MIT",
"scripts": {
"test": "jest --bail"
},
"devDependencies": {
"jest": "^26.0.1",
"jscodeshift": "^0.9.0"
},
"dependencies": {
"lodash.startcase": "^4.4.0"
}
}
Loading