Skip to content

Commit afe9f7d

Browse files
mdnormanmdnorman
committed
Merge remote-tracking branch 'node-ts-webpack-sapling/master'
2 parents f3ece1f + 00c7706 commit afe9f7d

9 files changed

Lines changed: 65 additions & 66 deletions

File tree

‎.eslintrc.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
env:
2+
browser: true
3+
es2021: true
4+
parser: '@typescript-eslint/parser'
5+
parserOptions:
6+
ecmaVersion: 12
7+
sourceType: module
8+
plugins:
9+
- '@typescript-eslint'
10+
- prettier
11+
rules:
12+
'prettier/prettier': error

‎.npmignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
node_modules
33
spec
44
src
5+
.editorconfig
6+
.eslintrc.yml
57
.gitignore
68
.prettierrc
79
npm-debug.log
810
tsconfig.json
9-
tslint.json
1011

1112
*.map

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v12.16.1
1+
16.5.0

‎.prettierrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"bracketSpacing": true,
23
"printWidth": 120,
34
"singleQuote": true,
45
"trailingComma": "all"

‎README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,10 @@ Many IDEs and editors support TSLint.
8181
8282
This project uses [Jest](https://jestjs.io/) for testing. Run tests before checking in.
8383
84-
### Unit Tests
85-
8684
```
8785
npm test
8886
```
8987
90-
### Integration Tests
91-
92-
```
93-
npm run test:integration
94-
```
95-
9688
## Building
9789
9890
### Development

‎licenses/sapling-license‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
Copyright (c) 2018 Michael D. Norman, deNormans
1+
Copyright (c) 2020 Michael D. Norman
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
4-
of this software and associated documentation files (the "Software"), to deal
5-
in the Software without restriction, including without limitation the rights
4+
of the Base Sapling (original at https://github.com/mdnorman/base-sapling),
5+
and associated documentation files (the "Base Sapling"), to deal
6+
in the Base Sapling without restriction, including without limitation the rights
67
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
copies of the Software, and to permit persons to whom the Software is
8+
copies of the Base Sapling, and to permit persons to whom the Base Sapling is
89
furnished to do so, subject to the following conditions:
910

1011
The above copyright notice and this permission notice shall be included in all
11-
copies or substantial portions of the Software.
12+
copies or substantial portions of the Base Sapling.
1213

13-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
THE BASE SAPLING IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1415
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1516
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1617
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1718
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19-
SOFTWARE.
19+
OUT OF OR IN CONNECTION WITH THE BASE SAPLING OR THE USE OR OTHER DEALINGS IN THE
20+
BASE SAPLING.
2021

21-
Except as contained in this notice, the name(s) of the above copyright holders
22-
shall not be used in advertising or otherwise to promote the sale, use or other
23-
dealings in this Software without prior written authorization.
22+
Except as contained in this notice, the name(s) of the above copyright holders
23+
shall not be used in advertising or otherwise to promote the sale, use or other
24+
dealings in this Base Sapling without prior written authorization.

‎package.json‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "CHANGEME",
44
"description": "",
55
"private": true,
6-
"license": "commercial",
6+
"license": "UNLICENSED",
77
"version": "0.0.0",
88
"homepage": "https://github.com/mdnorman/CHANGEME/wiki/Home",
99
"repository": {
@@ -23,7 +23,7 @@
2323
"test": "jest",
2424
"test:integration": "npm run pretest && jasmine --config=spec/support/jasmine-integration.json",
2525
"posttest": "npm run lint",
26-
"lint": "tslint -c tslint.json --project tsconfig.json && tslint -c tslint.json --project spec/tsconfig.json",
26+
"lint": "eslint",
2727
"pretty": "pretty-quick --stage",
2828
"server:development": "node dev-server.js",
2929
"deploy": "serverless deploy -v --stage test && serverless client deploy -v --no-confirm --no-delete-contents --stage test",
@@ -36,40 +36,41 @@
3636
"react-router-dom": "5.1.2"
3737
},
3838
"devDependencies": {
39-
"@types/jest": "25.1.3",
40-
"@types/node": "13.7.4",
39+
"@types/jest": "26.0.24",
40+
"@types/node": "16.4.5",
4141
"@types/react": "16.9.31",
4242
"@types/react-dom": "16.9.6",
4343
"@types/react-router-dom": "5.1.3",
44+
"@typescript-eslint/eslint-plugin": "4.28.5",
45+
"@typescript-eslint/parser": "4.28.5",
4446
"awesome-typescript-loader": "5.2.1",
45-
"css-loader": "3.4.2",
46-
"html-webpack-plugin": "4.0.3",
47-
"jest": "25.1.0",
48-
"prettier": "1.19.1",
49-
"pretty-quick": "2.0.1",
50-
"resolve-url-loader": "3.1.1",
51-
"sass-loader": "8.0.2",
52-
"serverless": "1.67.0",
53-
"serverless-finch": "2.3.2",
54-
"source-map-loader": "0.2.4",
55-
"style-loader": "1.1.3",
56-
"ts-jest": "25.3.0",
57-
"ts-node": "8.6.2",
58-
"tslint": "5.20.1",
59-
"tslint-config-airbnb": "5.11.2",
60-
"tslint-config-prettier": "1.18.0",
61-
"tslint-react": "4.2.0",
62-
"tsutils": "3.17.1",
63-
"typescript": "3.8.2",
64-
"url-loader": "4.0.0",
65-
"webpack": "4.42.1",
66-
"webpack-bundle-analyzer": "3.6.1",
67-
"webpack-command": "0.5.0",
68-
"webpack-dev-server": "3.10.3"
47+
"css-loader": "6.2.0",
48+
"eslint": "7.31.0",
49+
"eslint-plugin-import": "2.23.4",
50+
"eslint-plugin-prettier": "3.4.0",
51+
"html-webpack-plugin": "5.3.2",
52+
"jest": "27.0.6",
53+
"prettier": "2.3.2",
54+
"pretty-quick": "3.1.1",
55+
"resolve-url-loader": "4.0.0",
56+
"sass-loader": "12.1.0",
57+
"serverless": "2.52.1",
58+
"serverless-finch": "2.6.0",
59+
"source-map-loader": "3.0.0",
60+
"style-loader": "3.2.1",
61+
"ts-jest": "27.0.4",
62+
"ts-node": "10.1.0",
63+
"tsutils": "3.21.0",
64+
"typescript": "4.3.5",
65+
"typescript-eslint": "0.0.1-alpha.0",
66+
"url-loader": "4.1.1",
67+
"webpack": "5.47.0",
68+
"webpack-bundle-analyzer": "4.4.2",
69+
"webpack-command": "0.5.1",
70+
"webpack-dev-server": "3.11.2"
6971
},
70-
"optionalDependencies": {},
7172
"engines": {
72-
"npm": ">=6.13",
73-
"node": ">=12.16"
73+
"npm": ">=7.20",
74+
"node": ">=16.5"
7475
}
7576
}

‎renovate.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"extends": [
3+
"config:base"
4+
]
5+
}

‎tslint.json‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)
⚡