Skip to content

Commit 6100b62

Browse files
committed
Merge branch 'master' into pr/jdelStrother/3537
2 parents 6055c62 + fc52085 commit 6100b62

File tree

182 files changed

+5862
-3374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+5862
-3374
lines changed

.babelrc

Lines changed: 0 additions & 9 deletions
This file was deleted.

.changeset/README.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Changesets
2+
3+
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works with `bolt` to help you release components from a mono-repository. You can find the full documentation for it [here](https://www.npmjs.com/package/@changesets/cli)
4+
5+
To help you get started though, here are some things you should know about this folder:
6+
7+
## Changesets are automatically generated
8+
9+
Changesets are generated by the `yarn changeset` or `npx changeset` command. As long as you are following a changeset release flow, you shouldn't have any problems.
10+
11+
## Each changeset is its own folder
12+
13+
We use hashes by default for these folder names to avoid collisions when generating them, but there's no harm that will come from renaming them.
14+
15+
## Changesets are automatically removed
16+
17+
When `changeset bump` or equivalent command is run, all the changeset folders are removed. This is so we only ever use a changeset once. This makes this a very bad place to store any other information.
18+
19+
## Changesets come in two parts
20+
21+
You should treat these parts quite differently:
22+
23+
- `changes.md` is a file you should feel free to edit as much as you want. It will be prepended to your changelog when you next run your version command.
24+
- `changes.json` is a file that includes information about releases, what should be versioned by the version command. We strongly recommend against editing this directly, as you may make a new changeset that puts your bolt repository into an invalid state.
25+
26+
## I want to edit the information in a `changes.json` - how do I do it safely?
27+
28+
The best option is to make a new changeset using the changeset command, copy over the `changes.md`, then delete the old changeset.
29+
30+
## Can I rename the folder for my changeset?
31+
32+
Absolutely! We need unique hashes to make changesets play nicely with git, but changing your folder from our hash to your own name isn't going to cause any problems.
33+
34+
## Can I manually delete changesets?
35+
36+
You can, but you should be aware this will remove the intent to release communicated by the changeset, and should be done with caution.

.changeset/config.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3+
"changelog": "./getChangelogEntry",
4+
"commit": false,
5+
"linked": [],
6+
"access": "public"
7+
}

.changeset/getChangelogEntry.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
require('dotenv').config();
2+
const { getInfo } = require('@changesets/get-github-info');
3+
4+
const getReleaseLine = async (changeset, type) => {
5+
const [firstLine, ...futureLines] = changeset.summary
6+
.split('\n')
7+
.map(l => l.trimRight());
8+
let { links } = await getInfo({
9+
repo: 'JedWatson/react-select',
10+
commit: changeset.commit,
11+
});
12+
return `- ${links.commit}${links.pull === null ? '' : ` ${links.pull}`}${
13+
links.user === null ? '' : ` Thanks ${links.user}!`
14+
} - ${firstLine}\n${futureLines.map(l => ` ${l}`).join('\n')}`;
15+
};
16+
17+
const getDependencyReleaseLine = async (changesets, dependenciesUpdated) => {
18+
if (dependenciesUpdated.length === 0) return '';
19+
20+
const changesetLinks = changesets.map(
21+
changeset => `- Updated dependencies [${changeset.commit}]:`
22+
);
23+
24+
const updatedDepenenciesList = dependenciesUpdated.map(
25+
dependency => ` - ${dependency.name}@${dependency.version}`
26+
);
27+
28+
return [...changesetLinks, ...updatedDepenenciesList].join('\n');
29+
};
30+
31+
module.exports = {
32+
getReleaseLine,
33+
getDependencyReleaseLine,
34+
};

.changeset/nine-goats-care.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-select": minor
3+
---
4+
5+
Add `isLoading` prop support to the AsyncSelect component (see #3690)

.changeset/old-tips-leave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-select": patch
3+
---
4+
5+
Allow the input component to be a `textarea` element

.changeset/soft-lemons-invent.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'react-select': patch
3+
---
4+
5+
Update react-transition-group to ^4.3.0

.circleci/config.yml

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ docker_defaults: &docker_defaults
44
docker:
55
- image: cypress/base:8
66
environment:
7-
TERM: xterm
7+
TERM: xterm
88
working_directory: ~/project/repo
99

1010
attach_workspace: &attach_workspace
@@ -15,36 +15,36 @@ install_steps: &install_steps
1515
steps:
1616
- checkout
1717
- restore_cache:
18-
name: Restore node_modules cache
19-
keys:
20-
- dependency-cache-{{ .Branch }}-{{ checksum "package.json" }}
21-
- dependency-cache-{{ .Branch }}-
22-
- dependency-cache-
18+
name: Restore node_modules cache
19+
keys:
20+
- dependency-cache-{{ .Branch }}-{{ checksum "package.json" }}
21+
- dependency-cache-{{ .Branch }}-
22+
- dependency-cache-
2323
- run:
24-
name: Installing Dependencies
25-
command: |
26-
yarn install --silent
24+
name: Installing Dependencies
25+
command: |
26+
yarn install --silent
2727
- save_cache:
28-
name: Save node_modules cache
29-
key: dependency-cache-{{ .Branch }}-{{ checksum "package.json" }}
30-
paths:
31-
- node_modules/
28+
name: Save node_modules cache
29+
key: dependency-cache-{{ .Branch }}-{{ checksum "package.json" }}
30+
paths:
31+
- node_modules/
3232
- persist_to_workspace:
33-
root: ~/project
34-
paths:
35-
- repo
33+
root: ~/project
34+
paths:
35+
- repo
3636

3737
workflows:
3838
version: 2
3939
build_pipeline:
4040
jobs:
4141
- build
4242
- unit_test:
43-
requires:
44-
- build
43+
requires:
44+
- build
4545
- end_to_end:
46-
requires:
47-
- build
46+
requires:
47+
- build
4848
jobs:
4949
build:
5050
<<: *docker_defaults
@@ -54,16 +54,17 @@ jobs:
5454
steps:
5555
- *attach_workspace
5656
- run:
57-
name: Running unit tests
58-
command: |
59-
yarn lint
60-
yarn test:jest
61-
yarn coveralls
57+
name: Running unit tests
58+
command: |
59+
yarn lint
60+
yarn flow check --flowconfig-name=.flowconfig-ci
61+
yarn test:jest
62+
yarn coveralls
6263
end_to_end:
6364
<<: *docker_defaults
6465
steps:
6566
- *attach_workspace
6667
- run:
67-
name: Running E2E tests
68-
command: |
69-
yarn e2e
68+
name: Running E2E tests
69+
command: |
70+
yarn e2e

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ dist/*
55
flow-typed/*
66
lib/*
77
node_modules/*
8+
**/node_modules/*

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module.exports = {
1414
argsIgnorePattern: '^event$',
1515
ignoreRestSiblings: true,
1616
vars: 'all',
17+
varsIgnorePattern: 'jsx|emotionJSX'
1718
},
1819
],
1920
curly: [2, 'multi-line'],

0 commit comments

Comments
 (0)