Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
bb1a8ef
Notes about BN fork (#1)
varney Feb 25, 2022
cf607af
Bump underscore (#5)
varney Feb 25, 2022
d160bc5
Remove node 8.x, 10.x support, add node 12.x, 14.x
varney Feb 26, 2022
ed863db
gulp-sass -> v5 (#7)
varney Feb 26, 2022
6c146f5
Bump dev deps (#8)
varney Feb 26, 2022
5e65725
Bump loaders and webpack (#9)
varney Feb 26, 2022
957cccc
React -> 16.14
varney Feb 27, 2022
72c4b1e
Explicitly allow console.log where used (#11)
varney Feb 27, 2022
7983f9e
Use sinon latest (#12)
varney Feb 27, 2022
ac843ee
lerna -> 3.x (#13)
varney Feb 27, 2022
1fc097b
lerna -> 4.x (#14)
varney Feb 27, 2022
92c8db1
Bump version strings (#16)
varney Feb 28, 2022
18f218c
Publish
varney Feb 28, 2022
1025f28
Make it useable from our fork (#17)
varney Mar 1, 2022
02e924e
Bump dev deps in example (#18)
varney Mar 1, 2022
2148c79
Fix badge
varney Mar 2, 2022
a0351d9
Use BN fork of gulp (#19)
varney Mar 4, 2022
d8d15e0
Bump deps (#21)
varney Mar 26, 2022
a410226
Bump deps in packages (#23)
varney Mar 26, 2022
8da5c2e
Create dependabot.yml
varney Apr 10, 2022
0842706
Bump deps (#36)
varney Apr 18, 2022
f49b735
Bump to node 16 (#53)
varney Jun 10, 2022
824203b
Bump deps (#56)
varney Jun 10, 2022
48528e5
Bump dependencies (#72)
varney Jul 8, 2022
e06fbc1
Bump deps (#79)
varney Jul 21, 2022
d62794f
Bump deps (#88)
varney Aug 9, 2022
1256f4d
Bump deps (#114)
varney Sep 26, 2022
9e19618
Bump to node 18 (#149)
MrGuzior Nov 16, 2022
872e9e6
Bump loader utils (#152)
varney Nov 17, 2022
0d5aaec
Bump decode-uri-component
varney Dec 14, 2022
ccab5a8
yarn build
varney Dec 14, 2022
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .babelrc

This file was deleted.

24 changes: 24 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# node
node_modules
package-lock.json

# testing
coverage
.eslintcache

# misc
.DS_Store
.vscode

# logs
lerna-debug.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# gh-pages
storybook-static

# build
dist
lib
44 changes: 43 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "airbnb",
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"env": {
"browser": true,
"jest": true,
Expand All @@ -10,12 +10,54 @@
"react"
],
"rules": {
"semi": "off",
"arrow-parens": "off",
"default-param-last": "off",
"prefer-object-spread": "off",
"class-methods-use-this": "off",
"function-paren-newline": 0,
"function-call-argument-newline": "off",
"operator-linebreak": "off",
"implicit-arrow-linebreak": "off",
"no-else-return": "off",
"object-curly-newline": "off",
"no-multiple-empty-lines": "off",
"no-trailing-spaces": "off",
"no-restricted-globals": "off",
"lines-between-class-members": "off",
"no-undef": "off",
"prefer-destructuring": "off",
"react/destructuring-assignment": 0,
"react/sort-comp": 0,
"react/no-this-in-sfc": 0,
"react/default-props-match-prop-types": 0,
"react/no-unused-prop-types": 0,
"react/no-access-state-in-setstate": 0,
"react/button-has-type": 0,
"react/function-component-definition": 0,
"react/no-unstable-nested-components": 0,
"react/no-unused-class-component-methods": 0,
"react/static-property-placement": 0,
"react/state-in-constructor": 0,
"react/jsx-wrap-multilines": 0,
"react/jsx-closing-tag-location": 0,
"react/jsx-no-bind": 0,
"react/jsx-one-expression-per-line": 0,
"react/jsx-curly-brace-presence": 0,
"react/jsx-props-no-spreading": 0,
"react/jsx-no-constructed-context-values": 0,
"react/jsx-fragments": 0,
"jsx-a11y/anchor-is-valid": 0,
"jsx-a11y/click-events-have-key-events": 0,
"jsx-a11y/label-has-associated-control": 0,
"jsx-a11y/control-has-associated-label": 0,
"comma-dangle": ["error", "never"],
"react/jsx-curly-spacing": [2, "always"],
"react/forbid-prop-types": 0,
"react/jsx-filename-extension": 0,
"react/jsx-space-before-closing": 0,
"react/jsx-tag-spacing": ["error", { "beforeSelfClosing": "always" }],
"import/no-relative-packages": 0,
"import/extensions": 0, // skip import extensions
"import/no-unresolved": [0, { "ignore": ["^react-bootstrap-table"] }], // monorepo setup
"import/prefer-default-export": 0,
Expand Down
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '37 13 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
#- name: Autobuild
# uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
41 changes: 41 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# This workflow will do a clean installation 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: [16.x, 18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'

- name: Install dependencies
run: yarn install --frozen-lockfile
env:
CI: true
NODE_ENV: "test"

- name: Run Tests
run: yarn test
env:
NODE_ENV: "test"
CI: true

4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,3 @@ yarn-error.log*

# gh-pages
storybook-static

# build
lib
dist
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

42 changes: 40 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
# react-bootstrap-table2
## BN fork

![Build Status](https://github.com/BonnierNews/react-bootstrap-table2/actions/workflows/node.js.yml/badge.svg)

This is a fork of Allen Fangs [react-bootstrap-table2](https://github.com/react-bootstrap-table/react-bootstrap-table2) repo, which is the repo for [react-bootstrap-table-next](https://www.npmjs.com/package/react-bootstrap-table-next) on npm.

That repo seems to have been abandoned, so this fork was created simply to keep packages up to date with security fixes.

Specific packages from this repo can be used via [gitpkg.now.sh](https://gitpkg.now.sh/):
e.g (packages from tag v1.0.0 in this repo):

`yarn add https://gitpkg.now.sh/BonnierNews/react-bootstrap-table2/packages/react-bootstrap-table2?v1.0.0`

`yarn add https://gitpkg.now.sh/BonnierNews/react-bootstrap-table2/packages/react-bootstrap-table2-editor?v1.0.0`

`yarn add https://gitpkg.now.sh/BonnierNews/react-bootstrap-table2/packages/react-bootstrap-table2-filter?v1.0.0`


Or by adding directly to package.json.
e.g (packages from tag v1.0.0 in this repo)
```
"react-bootstrap-table-next": "https://gitpkg.now.sh/BonnierNews/react-bootstrap-table2/packages/react-bootstrap-table2?v1.0.0",
"react-bootstrap-table2-editor": "https://gitpkg.now.sh/BonnierNews/react-bootstrap-table2/packages/react-bootstrap-table2-editor?v1.0.0",
"react-bootstrap-table2-filter": "https://gitpkg.now.sh/BonnierNews/react-bootstrap-table2/packages/react-bootstrap-table2-filter?v1.0.0",
```

# release new version of BN Fork
- locally (in new branch, after making changes, and bumping version string in root package.json):
```bash
yarn test
yarn build
git add .
git commit -m"Bump version"
git push
```
- on Github
- - merge PR
- - create new release with tag matching new version string in root package.json

## react-bootstrap-table2

[![Build Status](https://travis-ci.org/react-bootstrap-table/react-bootstrap-table2.svg?branch=master)](https://travis-ci.org/react-bootstrap-table/react-bootstrap-table2)
Rebuild of [react-bootstrap-table](https://github.com/AllenFang/react-bootstrap-table)

> Note that `react-bootstrap-table2`'s npm module name is [**`react-bootstrap-table-next`**](https://www.npmjs.com/package/react-bootstrap-table-next) due to the name being already taken.
Expand Down
3 changes: 3 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-react", "@babel/preset-env"]
}
2 changes: 1 addition & 1 deletion enzyme-setup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Adapter from 'enzyme-adapter-react-16.3';
import Adapter from 'enzyme-adapter-react-16';
import { configure } from 'enzyme';

const configureEnzyme = () => {
Expand Down
16 changes: 8 additions & 8 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import gulp from 'gulp';
import babel from 'gulp-babel';
import sass from 'gulp-sass';
import cleanCSS from 'gulp-clean-css';
import cleanDir from 'gulp-clean';
import rename from 'gulp-rename';
import shell from 'gulp-shell';
const gulp = require('gulp');
const babel = require('gulp-babel');
const sass = require('gulp-sass')(require('sass'));
const cleanCSS = require('gulp-clean-css');
const cleanDir = require('gulp-clean');
const rename = require('gulp-rename');
const shell = require('gulp-shell');

const LIB = 'lib';
const DIST = 'dist';
Expand All @@ -27,7 +27,7 @@ const STYLE_PKGS = [
'react-bootstrap-table2',
'react-bootstrap-table2-filter',
'react-bootstrap-table2-paginator',
'react-bootstrap-table2-toolkit',
'react-bootstrap-table2-toolkit'
].reduce((pkg, curr) => `${curr}|${pkg}`, '');

const STYLE_SKIPS = `+(${NODE_MODULES})`;
Expand Down
3 changes: 2 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"lerna": "2.0.0",
"lerna": "4.0.0",
"npmClient": "yarn",
"packages": [
"packages/*"
],
Expand Down
Loading