Merge branch 'release/1.6.0'

Author: wimpyprogrammer

.auto-changelog

@@ -0,0 +1,8 @@
+{
+	"commitLimit": false,
+	"ignoreCommitPattern": "Bump .* version|Merge tag .+ into develop",
+	"package": true,
+	"sortCommits": "date-desc",
+	"startingVersion": "1.0.1",
+	"template": "keepachangelog"
+}

.babelrc

@@ -1,3 +1,11 @@
 {
-  "presets": ["@babel/preset-env", "@babel/preset-react"]
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": "last 1 version, not dead, > 0.2%"
+      }
+    ],
+    "@babel/preset-react"
+  ]
 }

.browserslistrc

@@ -9,6 +9,10 @@ end_of_line = lf
 insert_final_newline = true
 indent_style = tab
 
+[*.yml]
+indent_style = space
+indent_size = 2
+
 [{.babelrc,package.json}]
 indent_style = space
 indent_size = 2

.editorconfig

@@ -16,6 +16,7 @@
 			},
 			"rules": {
 				"max-classes-per-file": "off",
+				"no-plusplus": "off",
 				"react/jsx-props-no-spreading": "off"
 			}
 		}

.eslintrc.json

@@ -0,0 +1,19 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "saturday"
+    assignees:
+      - "wimpyprogrammer"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "saturday"
+    assignees:
+      - "wimpyprogrammer"
+    versioning-strategy: "widen"

.github/dependabot.yml

@@ -0,0 +1,36 @@
+name: Security Scan
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+  schedule:
+    # 02:27 on Thursdays
+    - cron: "27 2 * * 4"
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["javascript"]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/security-scan.yml

@@ -0,0 +1,54 @@
+name: Tests
+
+on:
+  push:
+    branches: [main, develop]
+  pull_request:
+    branches: [main, develop]
+  schedule:
+    # 07:34 on Saturdays
+    - cron: "34 7 * * SAT"
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [12.x, 16.x, lts/*]
+        react-version: [0.13, 0.14, 15, 16]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: "2"
+
+      - name: Test on Node ${{ matrix.node-version }}
+        uses: actions/[email protected]
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - run: npm install
+      - run: npx enzyme-adapter-react-install 16
+        env:
+          NPM_CONFIG_LEGACY_PEER_DEPS: true
+          REACT: ${{ matrix.react-version }}
+      - run: npm run lint
+      - run: npm run build
+      - run: npm run test
+      - run: npx testpack-cli --keep=@babel/*,create-react-class,enzyme*,jest*,react* .babelrc jest.config.js test-*.js src/*.spec.js
+
+      - name: Upload test coverage report to Codecov
+        uses: codecov/[email protected]
+        with:
+          fail_ci_if_error: false
+
+      - name: Run Snyk to check for vulnerabilities
+        if: ${{ github.actor != 'dependabot[bot]' }}
+        uses: snyk/actions/node@master
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/tests.yml

@@ -0,0 +1,12 @@
+{
+	"hooks": {
+		"before:init": ["npm run lint", "npm test"],
+		"after:bump": "npm run build"
+	},
+	"git": {
+		"changelog": false,
+		"commit": false,
+		"requireBranch": "main",
+		"tagName": "${version}"
+	}
+}

.publishrc

@@ -0,0 +1,17 @@
+module.exports = {
+	clearMocks: true,
+	collectCoverageFrom: [
+		'src/**/!(*.spec).js',
+	],
+	collectCoverage: true,
+	setupFilesAfterEnv: [
+		'<rootDir>/test-shims.js',
+		'<rootDir>/test-setup.js',
+		'jest-extended/all',
+	],
+	testEnvironment: 'node',
+	testMatch: [
+		'**/src/*.spec.js?(x)',
+	],
+	verbose: true,
+};

.release-it.json

@@ -1,24 +1,20 @@
 {
   "name": "react-component-update",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Extends the native React Component to streamline updates",
   "main": "lib/index.js",
   "files": [
     "lib/**/!(*.spec).js"
   ],
   "engines": {
-    "node": ">=10"
+    "node": ">=12"
   },
   "scripts": {
-    "clean": "rimraf lib",
-    "build": "npm run clean && babel src --out-dir lib",
-    "build-and-test": "npm run test && npm run build",
-    "install-react": "enzyme-adapter-react-install 16",
+    "build": "babel src --out-dir lib --delete-dir-on-start",
+    "changelog": "npx auto-changelog",
     "lint": "eslint ./ --report-unused-disable-directives",
-    "test": "jest",
-    "travisci": "npm run install-react && npm run lint && npm run test && codecov",
-    "prepublish": "npx publish-please guard",
-    "publish-please": "npx publish-please"
+    "release": "npx release-it --no-increment",
+    "test": "jest"
   },
   "repository": {
     "type": "git",
@@ -35,43 +31,23 @@
     "@babel/core": "^7.2.2",
     "@babel/preset-env": "^7.2.0",
     "@babel/preset-react": "^7.0.0",
-    "babel-jest": "^26.3.0",
-    "chai": "^4.0.2",
-    "codecov": "^3.0.0",
+    "babel-jest": "^27.0.1",
     "create-react-class": "^15.6.0",
-    "dirty-chai": "^2.0.0",
     "enzyme": "^3.6.0",
     "enzyme-adapter-react-16": "^1.5.0",
     "enzyme-adapter-react-helper": "^1.3.0",
-    "eslint": "^7.8.0",
-    "eslint-config-airbnb": "^18.2.0",
-    "eslint-plugin-import": "^2.13.0",
+    "eslint": "^8.4.1",
+    "eslint-config-airbnb": "^19.0.2",
+    "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-jsx-a11y": "^6.1.0",
-    "eslint-plugin-react": "^7.11.0",
-    "jest": "^26.4.2",
-    "lodash.uniqueid": "^4.0.1",
-    "react": "*",
-    "react-dom": "*",
-    "react-test-renderer": "*",
-    "rimraf": "^3.0.2",
-    "sinon": "^9.0.3",
-    "sinon-chai": "^3.0.0"
+    "eslint-plugin-react": "^7.27.1",
+    "jest": "^27.0.3",
+    "jest-extended": "^1.2.0",
+    "react": "<17",
+    "react-dom": "<17",
+    "react-test-renderer": "<17"
   },
   "peerDependencies": {
-    "react": "*"
-  },
-  "jest": {
-    "coverageDirectory": "./coverage/",
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "src/**/!(*.spec).js"
-    ],
-    "setupFiles": [
-      "<rootDir>/test-shims.js",
-      "<rootDir>/test-setup.js"
-    ],
-    "testMatch": [
-      "**/src/*.spec.js?(x)"
-    ]
+    "react": "<17"
   }
 }

.travis.yml

@@ -10,17 +10,19 @@ class ReactComponentUpdate extends Component {
 		this.componentDidMountOrUpdate(this.props, this.state);
 	}
 
-	componentWillReceiveProps(nextProps) {
-		this.componentWillMountOrReceiveProps(nextProps);
+	componentWillReceiveProps(nextProps, maybeContext) {
+		this.componentWillMountOrReceiveProps(nextProps, maybeContext);
 	}
 
-	componentDidUpdate(prevProps, prevState) {
-		this.componentDidMountOrUpdate(prevProps, prevState);
+	componentDidUpdate(prevProps, prevState, maybeContext) {
+		this.componentDidMountOrUpdate(prevProps, prevState, maybeContext);
 	}
 
-	componentWillMountOrReceiveProps(nextProps) {}
+	/* istanbul ignore next */
+	componentWillMountOrReceiveProps(nextProps, maybeContext) { }
 
-	componentDidMountOrUpdate(prevProps, prevState) {}
+	/* istanbul ignore next */
+	componentDidMountOrUpdate(prevProps, prevState, maybeContext) { }
 }
 
 export default ReactComponentUpdate;