Skip to content

Commit 22125c1

Browse files
ShaggyTechShaggyTech
authored
Merge pull request #438 from ShaggyTech/staging
- dependency updates - rollup.config refactored, sourcemaps added back after they were accidentally removed in previous release
2 parents 45df335 + b02487e commit 22125c1

23 files changed

+4507
-6612
lines changed

‎.eslintrc.js

+4-17
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ module.exports = {
2020
],
2121
extends: [
2222
'eslint:recommended',
23-
'prettier',
24-
'plugin:prettier/recommended',
25-
'plugin:@typescript-eslint/eslint-recommended',
2623
'plugin:@typescript-eslint/recommended',
24+
'plugin:prettier/recommended',
2725
'plugin:node/recommended',
2826
'plugin:jest/all',
2927
'plugin:jest/style',
@@ -34,8 +32,9 @@ module.exports = {
3432
sourceType: 'module',
3533
},
3634
plugins: ['@typescript-eslint', 'prettier', 'jsdoc', 'jest'],
37-
/* 0('off'), 1('warn'), 2('error) */
3835
rules: {
36+
/* 0('off'), 1('warn'), 2('error) */
37+
3938
/*****************
4039
* ESLint Rules
4140
****************/
@@ -64,21 +63,12 @@ module.exports = {
6463
/*****************
6564
* JSDOC Rules
6665
****************/
67-
// "jsdoc/check-alignment": 1, // Recommended
68-
// "jsdoc/check-examples": 1,
69-
// "jsdoc/check-indentation": 1,
7066
'jsdoc/check-param-names': 1, // Recommended
7167
'jsdoc/check-syntax': 1,
72-
// "jsdoc/check-tag-names": 1, // Recommended
7368
'jsdoc/check-types': 1, // Recommended
7469
'jsdoc/implements-on-classes': 1, // Recommended
75-
'jsdoc/match-description': 1,
7670
'jsdoc/newline-after-description': 1, // Recommended
77-
// "jsdoc/no-types": 1,
78-
// "jsdoc/no-undefined-types": 1, // Recommended
7971
'jsdoc/require-description': 1,
80-
// "jsdoc/require-description-complete-sentence": 1,
81-
// "jsdoc/require-example": 1,
8272
'jsdoc/require-hyphen-before-param-description': 1,
8373
'jsdoc/require-jsdoc': 1, // Recommended
8474
'jsdoc/require-param': 1, // Recommended
@@ -95,11 +85,8 @@ module.exports = {
9585
* Jest Rules
9686
****************/
9787
'jest/no-disabled-tests': 0,
98-
// "jest/no-focused-tests": 1,
99-
// "jest/no-identical-title": 1,
100-
// "jest/prefer-to-have-length": 1,
101-
// "jest/valid-expect": 1,
10288
'jest/prefer-expect-assertions': 0,
89+
'jest/prefer-lowercase-title': 0,
10390
'jest/consistent-test-it': 0,
10491
'jest/no-hooks': 0,
10592
'jest/lowercase-name': 0,

‎.github/workflows/deployment.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v2.3.4
22+
uses: actions/checkout@v2.4.0
2323

2424
- name: Setup Node and Install Depedencies
2525
uses: actions/setup-node@v2
@@ -39,12 +39,12 @@ jobs:
3939
run: yarn build-docs
4040

4141
- name: Upload Coverage
42-
uses: codecov/codecov-action@v1
42+
uses: codecov/codecov-action@v2
4343
with:
4444
flags: unittests, master, push # optional
4545

4646
- name: Deploy Docs to gh-pages branch
47-
uses: JamesIves/[email protected].4
47+
uses: JamesIves/[email protected].8
4848
with:
4949
BRANCH: gh-pages # The branch the action should deploy to.
5050
FOLDER: docs # The folder the action should deploy.

‎.github/workflows/development.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v2.3.4
27+
uses: actions/checkout@v2.4.0
2828

2929
- name: Setup Node and Install Depedencies
3030
uses: actions/setup-node@v2
@@ -44,6 +44,6 @@ jobs:
4444
run: yarn build-docs
4545

4646
- name: Upload Coverage
47-
uses: codecov/codecov-action@v1
47+
uses: codecov/codecov-action@v2
4848
with:
4949
flags: unittests, dev, push, pull # optional

‎.github/workflows/master.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v2.3.4
22+
uses: actions/checkout@v2.4.0
2323

2424
- name: Setup Node and Install Depedencies
2525
uses: actions/setup-node@v2
@@ -39,6 +39,6 @@ jobs:
3939
run: yarn build-docs
4040

4141
- name: Upload Coverage
42-
uses: codecov/codecov-action@v1
42+
uses: codecov/codecov-action@v2
4343
with:
4444
flags: unittests, master, pull # optional

‎.husky/commit-msg

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
yarn commitlint --edit $1

‎.husky/pre-commit

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
yarn lint
5+
yarn test

‎.prettierrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"singleQuote": true,
3-
"endOfLine":"auto"
4-
}
3+
"endOfLine": "auto"
4+
}

‎global.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-fetch-mock'
1+
import 'jest-fetch-mock';

‎jsdoc.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@ module.exports = {
1010
source: {
1111
include: ['src', 'docsSrc'],
1212
includePattern: '.(js|ts|doc|tsdoc|md)',
13-
excludePattern: '(node_modules/|docs/|dev/|dist/|coverage/)'
13+
excludePattern: '(node_modules/|docs/|dev/|dist/|coverage/)',
1414
},
1515
plugins: [
1616
// 'node_modules/jsdoc-babel',
1717
// 'node_modules/jsdoc-plugin-typescript',
1818
'plugins/markdown',
1919
'node_modules/better-docs/typescript',
20-
'node_modules/better-docs/category'
20+
'node_modules/better-docs/category',
2121
],
2222
tags: {
2323
allowUnknownTags: true,
24-
dictionaries: ['jsdoc']
24+
dictionaries: ['jsdoc'],
2525
},
2626
templates: {
2727
cleverLinks: true,
2828
monospaceLinks: false,
2929
default: {
3030
staticFiles: {
31-
include: ['./docsSrc/static']
31+
include: ['./docsSrc/static'],
3232
},
33-
includeDate: false
33+
includeDate: false,
3434
},
3535
'better-docs': {
3636
name: `${PKG.name}`,
@@ -39,31 +39,31 @@ module.exports = {
3939
navigation: [
4040
{
4141
label: 'Github Source Code',
42-
href: `${PKG.repository.homepage}`
42+
href: `${PKG.repository.homepage}`,
4343
},
4444
{
4545
label: '@shaggytech',
46-
href: 'https://www.github.com/shaggytech'
47-
}
48-
]
49-
}
46+
href: 'https://www.github.com/shaggytech',
47+
},
48+
],
49+
},
5050
},
5151
opts: {
5252
recurse: true,
5353
verbose: false,
5454
destination: outDir,
5555
template: TEMPLATE,
5656
tutorials: './docsSrc/tutorials',
57-
readme: './README.md'
57+
readme: './README.md',
5858
},
5959
typescript: {
60-
moduleRoot: 'src'
60+
moduleRoot: 'src',
6161
},
6262
markdown: {
63-
idInHeadings: true
63+
idInHeadings: true,
6464
},
6565
babel: {
6666
extensions: ['ts', 'tsx'],
67-
ignore: ['**/*.(test|spec).ts']
68-
}
67+
ignore: ['**/*.(test|spec).ts'],
68+
},
6969
};

‎package.json

+34-46
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,13 @@
6565
"@semantic-release/github"
6666
]
6767
},
68-
"husky": {
69-
"hooks": {
70-
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
71-
}
72-
},
7368
"commitlint": {
7469
"extends": [
7570
"@commitlint/config-conventional"
7671
]
7772
},
78-
"config": {
79-
"commitizen": {
80-
"path": "./node_modules/cz-conventional-changelog"
81-
}
82-
},
8373
"scripts": {
74+
"prepare": "husky install",
8475
"prebuild": "yarn clean-dist",
8576
"build": "rollup -c rollup.config.ts",
8677
"prebuild-docs": "yarn clean-docs",
@@ -142,60 +133,57 @@
142133
"better-docs"
143134
],
144135
"dependencies": {
145-
"@babel/runtime": "7.14.8",
136+
"@babel/runtime": "7.16.5",
146137
"isomorphic-unfetch": "3.1.0"
147138
},
148139
"devDependencies": {
149-
"@babel/cli": "7.14.8",
150-
"@babel/core": "7.14.8",
151-
"@babel/plugin-transform-runtime": "7.14.5",
152-
"@babel/preset-env": "7.14.8",
153-
"@babel/preset-typescript": "7.14.5",
154-
"@commitlint/cli": "12.1.4",
155-
"@commitlint/config-conventional": "12.1.4",
140+
"@babel/cli": "7.16.0",
141+
"@babel/core": "7.16.5",
142+
"@babel/plugin-transform-runtime": "7.16.5",
143+
"@babel/preset-env": "7.16.5",
144+
"@babel/preset-typescript": "7.16.5",
145+
"@commitlint/cli": "16.0.0",
146+
"@commitlint/config-conventional": "16.0.0",
156147
"@rollup/plugin-babel": "5.3.0",
157-
"@rollup/plugin-commonjs": "19.0.1",
148+
"@rollup/plugin-commonjs": "21.0.1",
158149
"@rollup/plugin-json": "4.1.0",
159-
"@rollup/plugin-node-resolve": "13.0.2",
160-
"@semantic-release/changelog": "5.0.1",
161-
"@semantic-release/git": "9.0.0",
162-
"@types/jest": "26.0.24",
163-
"@types/node": "14.17.5",
164-
"@types/node-fetch": "2.5.11",
165-
"@typescript-eslint/eslint-plugin": "4.28.4",
166-
"@typescript-eslint/parser": "4.28.4",
150+
"@rollup/plugin-node-resolve": "13.1.1",
151+
"@semantic-release/changelog": "6.0.1",
152+
"@semantic-release/git": "10.0.1",
153+
"@types/jest": "27.0.3",
154+
"@types/node": "16.11.17",
155+
"@typescript-eslint/eslint-plugin": "5.8.0",
156+
"@typescript-eslint/parser": "5.8.0",
167157
"better-docs": "2.3.2",
168-
"commitizen": "4.2.4",
169-
"concurrently": "6.2.0",
158+
"concurrently": "6.5.1",
170159
"copyfiles": "2.4.1",
171160
"cross-env": "7.0.3",
172-
"cz-conventional-changelog": "3.3.0",
173-
"eslint": "7.31.0",
161+
"eslint": "8.5.0",
174162
"eslint-config-prettier": "8.3.0",
175-
"eslint-plugin-jest": "24.4.0",
176-
"eslint-plugin-jsdoc": "35.5.0",
163+
"eslint-plugin-jest": "25.3.0",
164+
"eslint-plugin-jsdoc": "37.4.0",
177165
"eslint-plugin-node": "11.1.0",
178-
"eslint-plugin-prettier": "3.4.0",
166+
"eslint-plugin-prettier": "4.0.0",
179167
"form-data": "4.0.0",
180-
"husky": "7.0.1",
181-
"jest": "27.0.6",
168+
"husky": "7.0.4",
169+
"jest": "27.4.5",
182170
"jest-fetch-mock": "3.0.3",
183171
"jsdoc": "3.6.7",
184172
"jsdoc-babel": "0.5.0",
185173
"jsdoc-plugin-typescript": "2.0.6",
186-
"jsdoc-to-markdown": "7.0.1",
174+
"jsdoc-to-markdown": "7.1.0",
187175
"lodash.camelcase": "4.3.0",
188-
"nodemon": "2.0.12",
189-
"prettier": "2.3.2",
176+
"nodemon": "2.0.15",
177+
"prettier": "2.5.1",
190178
"rimraf": "3.0.2",
191-
"rollup": "2.53.3",
192-
"rollup-plugin-gzip": "2.5.0",
179+
"rollup": "2.62.0",
180+
"rollup-plugin-gzip": "3.0.0",
193181
"rollup-plugin-terser": "7.0.2",
194-
"rollup-plugin-typescript2": "0.30.0",
182+
"rollup-plugin-typescript2": "0.31.1",
195183
"rollup-plugin-visualizer": "5.5.2",
196-
"semantic-release": "17.4.4",
197-
"ts-jest": "27.0.4",
198-
"ts-node": "10.1.0",
199-
"typescript": "4.3.5"
184+
"semantic-release": "18.0.1",
185+
"ts-jest": "27.1.2",
186+
"ts-node": "10.4.0",
187+
"typescript": "4.5.4"
200188
}
201189
}

0 commit comments

Comments
 (0)