Merge remote-tracking branch 'node-ts-webpack-sapling/master'

.eslintrc.yml

@@ -0,0 +1,12 @@
+env:
+  browser: true
+  es2021: true
+parser: '@typescript-eslint/parser'
+parserOptions:
+  ecmaVersion: 12
+  sourceType: module
+plugins:
+  - '@typescript-eslint'
+  - prettier
+rules:
+  'prettier/prettier': error

.npmignore

@@ -2,10 +2,11 @@
 node_modules
 spec
 src
+.editorconfig
+.eslintrc.yml
 .gitignore
 .prettierrc
 npm-debug.log
 tsconfig.json
-tslint.json
 
 *.map

.nvmrc

@@ -1 +1 @@
-v12.16.1
+16.5.0

.prettierrc

@@ -1,4 +1,5 @@
 {
+  "bracketSpacing": true,
   "printWidth": 120,
   "singleQuote": true,
   "trailingComma": "all"

README.md

@@ -81,18 +81,10 @@ Many IDEs and editors support TSLint.
 
 This project uses [Jest](https://jestjs.io/) for testing. Run tests before checking in.
 
-### Unit Tests
-
 ```
 npm test
 ```
 
-### Integration Tests
-
-```
-npm run test:integration
-```
-
 ## Building
 
 ### Development

licenses/sapling-license

@@ -1,23 +1,24 @@
-Copyright (c) 2018 Michael D. Norman, deNormans
+Copyright (c) 2020 Michael D. Norman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
+of the Base Sapling (original at https://github.com/mdnorman/base-sapling),
+and associated documentation files (the "Base Sapling"), to deal
+in the Base Sapling without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
+copies of the Base Sapling, and to permit persons to whom the Base Sapling is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+copies or substantial portions of the Base Sapling.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE BASE SAPLING IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE BASE SAPLING OR THE USE OR OTHER DEALINGS IN THE
+BASE SAPLING.
 
-Except as contained in this notice, the name(s) of the above copyright holders 
-shall not be used in advertising or otherwise to promote the sale, use or other 
-dealings in this Software without prior written authorization.
+Except as contained in this notice, the name(s) of the above copyright holders
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Base Sapling without prior written authorization.

package.json

@@ -3,7 +3,7 @@
   "name": "CHANGEME",
   "description": "",
   "private": true,
-  "license": "commercial",
+  "license": "UNLICENSED",
   "version": "0.0.0",
   "homepage": "https://github.com/mdnorman/CHANGEME/wiki/Home",
   "repository": {
@@ -23,7 +23,7 @@
     "test": "jest",
     "test:integration": "npm run pretest && jasmine --config=spec/support/jasmine-integration.json",
     "posttest": "npm run lint",
-    "lint": "tslint -c tslint.json --project tsconfig.json && tslint -c tslint.json --project spec/tsconfig.json",
+    "lint": "eslint",
     "pretty": "pretty-quick --stage",
     "server:development": "node dev-server.js",
     "deploy": "serverless deploy -v --stage test && serverless client deploy -v --no-confirm --no-delete-contents --stage test",
@@ -36,40 +36,41 @@
     "react-router-dom": "5.1.2"
   },
   "devDependencies": {
-    "@types/jest": "25.1.3",
-    "@types/node": "13.7.4",
+    "@types/jest": "26.0.24",
+    "@types/node": "16.4.5",
     "@types/react": "16.9.31",
     "@types/react-dom": "16.9.6",
     "@types/react-router-dom": "5.1.3",
+    "@typescript-eslint/eslint-plugin": "4.28.5",
+    "@typescript-eslint/parser": "4.28.5",
     "awesome-typescript-loader": "5.2.1",
-    "css-loader": "3.4.2",
-    "html-webpack-plugin": "4.0.3",
-    "jest": "25.1.0",
-    "prettier": "1.19.1",
-    "pretty-quick": "2.0.1",
-    "resolve-url-loader": "3.1.1",
-    "sass-loader": "8.0.2",
-    "serverless": "1.67.0",
-    "serverless-finch": "2.3.2",
-    "source-map-loader": "0.2.4",
-    "style-loader": "1.1.3",
-    "ts-jest": "25.3.0",
-    "ts-node": "8.6.2",
-    "tslint": "5.20.1",
-    "tslint-config-airbnb": "5.11.2",
-    "tslint-config-prettier": "1.18.0",
-    "tslint-react": "4.2.0",
-    "tsutils": "3.17.1",
-    "typescript": "3.8.2",
-    "url-loader": "4.0.0",
-    "webpack": "4.42.1",
-    "webpack-bundle-analyzer": "3.6.1",
-    "webpack-command": "0.5.0",
-    "webpack-dev-server": "3.10.3"
+    "css-loader": "6.2.0",
+    "eslint": "7.31.0",
+    "eslint-plugin-import": "2.23.4",
+    "eslint-plugin-prettier": "3.4.0",
+    "html-webpack-plugin": "5.3.2",
+    "jest": "27.0.6",
+    "prettier": "2.3.2",
+    "pretty-quick": "3.1.1",
+    "resolve-url-loader": "4.0.0",
+    "sass-loader": "12.1.0",
+    "serverless": "2.52.1",
+    "serverless-finch": "2.6.0",
+    "source-map-loader": "3.0.0",
+    "style-loader": "3.2.1",
+    "ts-jest": "27.0.4",
+    "ts-node": "10.1.0",
+    "tsutils": "3.21.0",
+    "typescript": "4.3.5",
+    "typescript-eslint": "0.0.1-alpha.0",
+    "url-loader": "4.1.1",
+    "webpack": "5.47.0",
+    "webpack-bundle-analyzer": "4.4.2",
+    "webpack-command": "0.5.1",
+    "webpack-dev-server": "3.11.2"
   },
-  "optionalDependencies": {},
   "engines": {
-    "npm": ">=6.13",
-    "node": ">=12.16"
+    "npm": ">=7.20",
+    "node": ">=16.5"
   }
 }

renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}