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.

Sign up for GitHub

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

Bump dependencies to make it work on Node 20 #36

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Bump dependencies to make it work on Node 20 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f643bde
Bump dependencies to make it work on Node 20
robinst Jan 25, 2024
cd09351
Upgrade to webpack 5
robinst Jan 29, 2024
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 .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const merge = require("webpack-merge");
const { merge } = require("webpack-merge");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently this changed in newer versions, see:

[webpack-cli] TypeError: merge is not a function
    at Object.<anonymous> (/Users/robinst/work/rsocket-chrome-devtools/webpack.dev.js:4:18)

const common = require("./webpack.common.js");

module.exports = merge(common, {
Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.js
View file
Open in desktop
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