Skip to content

Commit

Permalink
Merge pull request #36 from robinst/bump-dependencies
Browse files Browse the repository at this point in the history
Bump dependencies to make it work on Node 20
  • Loading branch information
SerCeMan authored Jan 29, 2024
2 parents 5cb905f + cd09351 commit 7dbbdc1
Show file tree
Hide file tree
Showing 6 changed files with 1,744 additions and 3,466 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 12
- 20
cache: yarn

before_install:
Expand Down
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,34 @@
"@types/rsocket-core": "^0.0.6",
"@types/rsocket-types": "^0.0.2",
"@types/rsocket-websocket-client": "^0.0.3",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^6.2.1",
"css-loader": "^5.0.1",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^6.9.1",
"devtools-protocol": "^0.0.852555",
"file-loader": "^6.2.0",
"html-loader": "^1.3.2",
"html-webpack-plugin": "4.5.1",
"node-sass": "^5.0.0",
"sass-loader": "^10.1.1",
"style-loader": "^2.0.0",
"ts-loader": "^8.0.14",
"html-loader": "^5.0.0",
"html-webpack-plugin": "^5.6.0",
"node-sass": "^9.0.0",
"sass-loader": "^14.0.0",
"style-loader": "^3.3.4",
"ts-loader": "^9.5.1",
"typescript": "^4.1.3",
"url-loader": "^4.1.1",
"webpack": "^4.42.1",
"webpack-cli": "^4.3.1"
"webpack": "^5.90.0",
"webpack-cli": "^5.1.4"
},
"dependencies": {
"buffer": "^6.0.3",
"classnames": "^2.2.6",
"flexsearch": "^0.7.21",
"flexsearch": "0.7.21",
"mobx": "^6.1.6",
"mobx-react-lite": "^3.2.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-flex-panel": "^1.0.0",
"react-fontawesome": "^1.7.1",
"react-inspector": "^5.1.0",
"react-virtualized-auto-sizer": "^1.0.6",
"react-virtualized-auto-sizer": "1.0.6",
"react-window": "^1.8.6",
"rsocket-core": "^0.0.27",
"rsocket-websocket-client": "^0.0.27"
Expand Down
23 changes: 11 additions & 12 deletions webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,11 @@ module.exports = {
devtools: path.join(__dirname, "src/devtools.ts"),
inspector: path.join(__dirname, "src/inspector.tsx"),
},
output: {
path: path.join(__dirname, "dist"),
filename: "[name].js"
},
module: {
rules: [
{
test: /\.css$/,
loader: "style-loader!css-loader",
use: ["style-loader", "css-loader"],
exclude: /node_modules/
},
{
Expand All @@ -38,8 +34,11 @@ module.exports = {
// loads the icon to the dist directory
{
test: new RegExp('\.(' + fileExtensions.join('|') + ')$'),
loader: "file-loader?name=[name].[ext]",
exclude: /node_modules/
exclude: /node_modules/,
loader: "file-loader",
options: {
name: '[name].[ext]'
}
},
{
exclude: /node_modules/,
Expand All @@ -58,13 +57,13 @@ module.exports = {
patterns: [
{
from: "src/manifest.json",
transform: function (content, path) {
// generates the manifest file using the package.json informations
return Buffer.from(JSON.stringify({
transform: function (input, path) {
// generates the manifest file using the package.json information
return JSON.stringify({
description: process.env.npm_package_description,
version: process.env.npm_package_version,
...JSON.parse(content.toString())
}));
...JSON.parse(input.toString())
});
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion webpack.dev.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const merge = require("webpack-merge");
const { merge } = require("webpack-merge");
const common = require("./webpack.common.js");

module.exports = merge(common, {
Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const merge = require("webpack-merge");
const { merge } = require("webpack-merge");
const common = require("./webpack.common.js");

module.exports = merge(common, {
Expand Down
Loading

0 comments on commit 7dbbdc1

Please sign in to comment.