Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/ua-parser-js-0.7.28
Browse files Browse the repository at this point in the history
  • Loading branch information
phwebi committed Sep 2, 2021
2 parents 17be754 + 972f93b commit e74bf69
Show file tree
Hide file tree
Showing 14 changed files with 821 additions and 466 deletions.
104 changes: 104 additions & 0 deletions .github/dependabot.yml
@@ -0,0 +1,104 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "13:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: conventional-recommended-bump
versions:
- ">= 5.a, < 6"
- dependency-name: conventional-recommended-bump
versions:
- ">= 6.a, < 7"
- dependency-name: cross-env
versions:
- ">= 5.a, < 6"
- dependency-name: cross-env
versions:
- ">= 6.a, < 7"
- dependency-name: cross-env
versions:
- ">= 7.a, < 8"
- dependency-name: css-loader
versions:
- ">= 3.a, < 4"
- dependency-name: customize-cra
versions:
- ">= 1.a, < 2"
- dependency-name: ejs
versions:
- ">= 3.a, < 4"
- dependency-name: raw-loader
versions:
- ">= 4.a, < 5"
- dependency-name: react-app-rewired
versions:
- ">= 2.a, < 3"
- dependency-name: react-helmet
versions:
- ">= 6.a, < 7"
- dependency-name: react-router
versions:
- ">= 4.a, < 5"
- dependency-name: react-router
versions:
- ">= 5.a, < 6"
- dependency-name: react-scripts
versions:
- "> 2.1.1"
- dependency-name: react-scripts
versions:
- ">= 3.a, < 4"
- dependency-name: react-transition-group
versions:
- ">= 4.a, < 5"
- dependency-name: rollup
versions:
- ">= 2.a, < 3"
- dependency-name: rollup-plugin-babel-minify
versions:
- ">= 10.a, < 11"
- dependency-name: rollup-plugin-babel-minify
versions:
- ">= 9.a, < 10"
- dependency-name: rollup-plugin-node-resolve
versions:
- ">= 5.a, < 6"
- dependency-name: style-loader
versions:
- ">= 1.a, < 2"
- dependency-name: css-loader
versions:
- 5.0.1
- 5.0.2
- 5.1.0
- 5.1.1
- 5.1.2
- 5.1.3
- 5.1.4
- 5.2.0
- 5.2.1
- 5.2.3
- dependency-name: "@types/react"
versions:
- 17.0.1
- 17.0.2
- 17.0.3
- dependency-name: mini-css-extract-plugin
versions:
- 1.3.5
- 1.3.6
- 1.3.7
- 1.3.8
- 1.3.9
- dependency-name: "@babel/plugin-proposal-object-rest-spread"
versions:
- 7.12.13
- 7.13.0
- dependency-name: webpack-cli
versions:
- 4.4.0
- 4.5.0
30 changes: 30 additions & 0 deletions .github/workflows/coverage.yml
@@ -0,0 +1,30 @@
name: Test Coverage

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:

build:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v2

- name: Use Node.js 12.x
uses: actions/setup-node@v1
with:
node-version: 12.x
cache: 'yarn'

- run: rm -rf node_modules && yarn install --frozen-lockfile
- name: Run Coverage
run: |
npm run cover -- --runInBand
- name: Upload to Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
18 changes: 18 additions & 0 deletions .github/workflows/docs.yml
@@ -0,0 +1,18 @@
name: Manually Publish Docs
on: workflow_dispatch
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v2
with:
node-version: '12.x'
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
- name: Publish Docs
env:
GITHUB_TOKEN: ${{ secrets.REACTSTRAP_DOCS_GITHUB_TOKEN }}
run: ./scripts/docs
24 changes: 24 additions & 0 deletions .github/workflows/publish.yml
@@ -0,0 +1,24 @@
name: Publish NPM Package & Docs
on:
release:
types: [created]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v2
with:
node-version: '12.x'
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: rm -rf node_modules && yarn install --frozen-lockfile
- name: Publish NPM package
run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Publish Docs
env:
GITHUB_TOKEN: ${{ secrets.REACTSTRAP_DOCS_GITHUB_TOKEN }}
run: ./scripts/docs
32 changes: 32 additions & 0 deletions .github/workflows/test.yml
@@ -0,0 +1,32 @@
# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [12.x, 14.x, 16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
- run: rm -rf node_modules && yarn install --frozen-lockfile
- run: npm run lint
- run: npm run build --if-present
- run: npm test
67 changes: 0 additions & 67 deletions .travis.yml

This file was deleted.

9 changes: 9 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,12 @@
# [8.10.0](https://github.com/reactstrap/reactstrap/compare/8.9.0...8.10.0) (2021-09-02)


### Features

* **Dropdown:** add support for listbox or menu role ([#2077](https://github.com/reactstrap/reactstrap/issues/2077)) ([fd9e988](https://github.com/reactstrap/reactstrap/commit/fd9e9888b7712905a85684f7822fc75fde38c069))



# [8.9.0](https://github.com/reactstrap/reactstrap/compare/8.8.1...8.9.0) (2021-01-19)


Expand Down
16 changes: 3 additions & 13 deletions README.md
@@ -1,6 +1,6 @@
[![reactstrap](https://cloud.githubusercontent.com/assets/399776/13906899/1de62f0c-ee9f-11e5-95c0-c515fee8e918.png)](https://reactstrap.github.io)

[![CDNJS](https://img.shields.io/cdnjs/v/reactstrap.svg)](https://cdnjs.com/libraries/reactstrap) [![NPM Version](https://img.shields.io/npm/v/reactstrap.svg?branch=master)](https://www.npmjs.com/package/reactstrap) [![Build Status](https://travis-ci.org/reactstrap/reactstrap.svg?branch=master)](https://travis-ci.org/reactstrap/reactstrap) [![Coverage Status](https://coveralls.io/repos/github/reactstrap/reactstrap/badge.svg?branch=master)](https://coveralls.io/github/reactstrap/reactstrap?branch=master) [![License](https://img.shields.io/npm/l/reactstrap.svg)](https://github.com/reactstrap/reactstrap/blob/master/LICENSE)
[![CDNJS](https://img.shields.io/cdnjs/v/reactstrap.svg)](https://cdnjs.com/libraries/reactstrap) [![NPM Version](https://img.shields.io/npm/v/reactstrap.svg?branch=master)](https://www.npmjs.com/package/reactstrap) [![Build Status](https://github.com/reactstrap/reactstrap/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/reactstrap/reactstrap) [![Coverage Status](https://coveralls.io/repos/github/reactstrap/reactstrap/badge.svg?branch=master)](https://coveralls.io/github/reactstrap/reactstrap?branch=master) [![License](https://img.shields.io/npm/l/reactstrap.svg)](https://github.com/reactstrap/reactstrap/blob/master/LICENSE)

# reactstrap

Expand Down Expand Up @@ -243,21 +243,11 @@ To create a release branch and changelog, run the following command, optionally

Verify changelog in branch. Create a PR if everything looks good. Merge when tests are green.

#### Tagging and Publishing
#### Publishing

Note: you must have write permission to this repo do perform this action

Once the release branch is merged, checkout master and run:

```bash
./scripts/publish
```

This will build the current state of master, tag it based on the release version and push the tag up to GitHub. Travis will detect the new tag and publish to npm.

_OR_

You can create a new tag via the GitHub user interface. If you do it this way, make sure to use the correct version as the tag name (eg. `6.2.0`).
Once the release branch is merged, create a release from the tag generated in the release step via the Github UI. This will trigger a github action to publish the new version to npm and deploy the updated docs to https://reactstrap.github.io/.

## In the wild

Expand Down
17 changes: 17 additions & 0 deletions docs/lib/PremiumThemes/premium.js
Expand Up @@ -130,4 +130,21 @@ export default [
},
],
},
{
creator: {
name: 'MDBootstrap',
tagLine:
'Check out some examples that our partners from MDBootstrap created using the Reactstrap components library.',
link: 'https://mdbootstrap.com/',
},
products: [
{
title: 'Material Design for Bootstrap 5 & React 17',
tagLine: '700+ components, stunning templates, 1-min installation, extensive tutorials & huge community.',
imgUrl:
'https://mdbcdn.b-cdn.net/wp-content/themes/mdbootstrap4/content/en/_mdb5/react/about/assets/mdb5-react.jpg',
link: 'https://mdbootstrap.com/docs/b5/react/',
},
],
},
];
5 changes: 2 additions & 3 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "reactstrap",
"version": "8.9.0",
"version": "8.10.0",
"description": "React Bootstrap 4 components",
"main": "lib/index.js",
"types": "es/index.d.ts",
Expand All @@ -12,7 +12,6 @@
"esnext": "src/index.js",
"sideEffects": false,
"scripts": {
"report-coverage": "coveralls < ./coverage/lcov.info",
"test": "cross-env SKIP_PREFLIGHT_CHECK=true react-app-rewired test --env=jsdom",
"cover": "npm test -- --coverage",
"start": "webpack-dev-server --config ./webpack.docs.config.js --watch",
Expand All @@ -21,6 +20,7 @@
"build:umd": "rollup -c",
"build:lib": "babel src --out-dir lib --ignore src/__tests__/",
"build:esm": "cross-env BABEL_ENV=esm-dir babel src --out-dir es --ignore src/__tests__/",
"prepublishOnly": "npm run build",
"postbuild": "node ./scripts/postbuild.js",
"create-release": "npm run cover && sh ./scripts/release",
"publish-release": "npm run cover && sh ./scripts/publish",
Expand Down Expand Up @@ -286,7 +286,6 @@
"conventional-changelog-cli": "^2.0.21",
"conventional-recommended-bump": "^0.3.0",
"copy-webpack-plugin": "^6.0.2",
"coveralls": "^3.1.0",
"cross-env": "^2.0.0",
"css-loader": "^2.1.0",
"customize-cra": "^0.2.8",
Expand Down

0 comments on commit e74bf69

Please sign in to comment.