Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #515

Merged
merged 6 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [14.x, 16.x, 18.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
Expand Down
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint
42 changes: 18 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@
"type": "git",
"url": "git://github.com/jakubroztocil/rrule.git"
},
"husky": {
"hooks": {
"pre-commit": "yarn lint"
}
},
"scripts": {
"build": "yarn lint && tsc && webpack && tsc dist/esm/**/*.d.ts",
"lint": "yarn tslint --project . --fix --config tslint.json",
"test": "TS_NODE_PROJECT=tsconfig.test.json mocha **/*.test.ts",
"test-ci": "TS_NODE_PROJECT=tsconfig.test.json nyc mocha **/*.test.ts"
"run-ts": "TS_NODE_PROJECT=tsconfig.test.json node --loader ts-node/esm",
"test": "yarn run-ts ./node_modules/.bin/mocha **/*.test.ts",
"test-ci": "yarn run-ts ./node_modules/.bin/nyc yarn run-ts ./node_modules/.bin/mocha **/*.test.ts"
},
"nyc": {
"extension": [
Expand All @@ -46,34 +42,32 @@
"devDependencies": {
"@types/assert": "^1.4.3",
"@types/chai": "^4.2.7",
"@types/mocha": "^5.2.5",
"@types/mockdate": "^2.0.0",
"@types/node": "^12.12.18",
"@types/mocha": "^9.1.1",
"@types/mockdate": "^3.0.0",
"@types/node": "^17.0.41",
"chai": "^4.2.0",
"copy-webpack-plugin": "^5.1.1",
"coverage": "^0.4.1",
"html-webpack-plugin": "^3.2.0",
"husky": "^3.1.0",
"mocha": "^6.2.2",
"mockdate": "^2.0.5",
"nyc": "^14.1.1",
"source-map-loader": "^0.2.4",
"husky": "^8.0.1",
"mocha": "^10.0.0",
"mockdate": "^3.0.5",
"nyc": "^15.1.0",
"source-map-loader": "^3.0.1",
"source-map-support": "^0.5.16",
"ts-loader": "^6.2.1",
"ts-node": "^8.5.4",
"terser-webpack-plugin": "^5.3.3",
"ts-loader": "^9.3.0",
"ts-node": "^10.8.1",
"tslint": "^5.20.1",
"tslint-eslint-rules": "^5.4.0",
"typescript": "^3.7.3",
"uglifyjs-webpack-plugin": "^2.2.0",
"webpack": "^4.41.3",
"webpack-cli": "^3.3.10"
"typescript": "^4.7.3",
"webpack": "^5.73.0",
"webpack-cli": "^4.9.2"
},
"files": [
"dist",
"README.md"
],
"peerDependencies": {},
"dependencies": {
"tslib": "^1.10.0"
"tslib": "^2.4.0"
}
}
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"jsx": "react",
"strictNullChecks": true,
"importHelpers": true,
"esModuleInterop": true,
"rootDirs": ["./src/", "./test/"]
},
"include": ["./src/**/*"],
Expand Down
1 change: 1 addition & 0 deletions tsconfig.test.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"sourceMap": true,
"module": "commonjs",
"noEmitOnError": true,
"esModuleInterop": true,
"target": "es6",
"jsx": "react",
"baseUrl": ".",
Expand Down
1 change: 0 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
],
"await-promise": true,
"curly": [true, "ignore-same-line"],
"deprecation": true,
"label-position": true,
"no-arg": true,
"no-conditional-assignment": true,
Expand Down
11 changes: 2 additions & 9 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
const webpack = require("webpack");
const path = require("path");
const CopyWebpackPlugin = require("copy-webpack-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const TerserPlugin = require("terser-webpack-plugin");

const paths = {
source: path.resolve(__dirname, 'src'),
es5: path.resolve(__dirname, "dist", "es5"),
esm: path.resolve(__dirname, "dist", "esm")
};

const commonConfig = {
Expand Down Expand Up @@ -35,10 +31,7 @@ const commonConfig = {
optimization: {
minimize: true,
minimizer: [
new UglifyJsPlugin({
exclude: /\.ts$/,
include: /\.min\.js$/
})
new TerserPlugin(),
]
}
};
Expand Down
Loading