Skip to content

Commit

Permalink
Merge 916ba28 into 100f30a
Browse files Browse the repository at this point in the history
  • Loading branch information
cdtinney committed Feb 14, 2021
2 parents 100f30a + 916ba28 commit 4f54572
Show file tree
Hide file tree
Showing 15 changed files with 9,463 additions and 5,124 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,11 @@ $ npm run lint
### Releasing

Releases are done automatically via Travis CI and [`semantic-release`](https://github.com/semantic-release/semantic-release)
from the `master` branch.
upon merges (via Pull Request) to the `master` branch from the `develop` branch.

Release versions are determined by analyzing the commit message since the last tagged release commit. For this reason,
**pull requests must be REBASED** before merging from `develop` to `master`. Development pull requests to the `develop` branch
can be squashed.

To verify the repos for release:

Expand All @@ -156,7 +160,6 @@ To run the release script as a dry-run:
```
$ npm run release
```

## License

MIT
20 changes: 4 additions & 16 deletions config/rollup.config.dev.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import babel from 'rollup-plugin-babel';
import replace from 'rollup-plugin-replace';
import liveServer from 'rollup-plugin-live-server';
import { liveServer } from 'rollup-plugin-live-server';
import postcss from 'rollup-plugin-postcss';
import image from '@timdp/rollup-plugin-image';
import externals from './externals';
Expand Down Expand Up @@ -43,7 +43,7 @@ module.exports = [{
postcss({
plugins: [],
}),
resolve({
nodeResolve({
browser: true,
extensions: [
'.js', '.jsx',
Expand All @@ -57,18 +57,6 @@ module.exports = [{
exclude: [
'node_modules/process-es6/**',
],
namedExports: {
'node_modules/react/index.js': [
'Component',
'PureComponent',
'Fragment',
'Children',
'createElement',
],
'node_modules/react-dom/index.js': [
'render',
],
},
}),
replace({
'process.env.NODE_ENV':
Expand Down
18 changes: 3 additions & 15 deletions config/rollup.config.docs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import babel from 'rollup-plugin-babel';
import replace from 'rollup-plugin-replace';
import postcss from 'rollup-plugin-postcss';
Expand Down Expand Up @@ -44,7 +44,7 @@ module.exports = [{
postcss({
plugins: [],
}),
resolve({
nodeResolve({
browser: true,
extensions: [
'.js', '.jsx',
Expand All @@ -58,18 +58,6 @@ module.exports = [{
exclude: [
'node_modules/process-es6/**',
],
namedExports: {
'node_modules/react/index.js': [
'Component',
'PureComponent',
'Fragment',
'Children',
'createElement',
],
'node_modules/react-dom/index.js': [
'render',
],
},
}),
replace({
'process.env.NODE_ENV':
Expand Down
Loading

0 comments on commit 4f54572

Please sign in to comment.