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

Update deps including electron 28->29 #4256

Merged
merged 3 commits into from
Mar 4, 2024
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
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
"css-minimizer-webpack-plugin": "^6.0.0",
"dependency-graph": "^0.11.0",
"dotenv": "^16.3.1",
"dotenv-expand": "^10.0.0",
"electron": "28.2.1",
"dotenv-expand": "^11.0.3",
"electron": "29.1.0",
"electron-builder": "^24.8.0",
"electron-mock-ipc": "^0.3.8",
"eslint": "^8.0.0",
Expand All @@ -111,7 +111,7 @@
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-react-refresh": "^0.4.3",
"eslint-plugin-tsdoc": "^0.2.4",
"eslint-plugin-unicorn": "^50.0.1",
"eslint-plugin-unicorn": "^51.0.1",
"express": "^4.18.2",
"express-basic-auth": "^1.2.1",
"file-loader": "^6.2.0",
Expand Down Expand Up @@ -155,7 +155,7 @@
"web-encoding": "^1.1.5",
"webpack": "^5.64.4",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.6.0",
"webpack-dev-server": "^5.0.0",
"webpack-manifest-plugin": "^5.0.0"
},
"version": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions products/jbrowse-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@
"use-query-params": "^2.0.0"
},
"devDependencies": {
"electron": "28.2.1"
"electron": "29.1.0"
},
"browserslist": [
"last 1 chrome version"
],
"build": {
"electronVersion": "28.2.1",
"electronVersion": "29.1.0",
"extraMetadata": {
"main": "build/electron.js"
},
Expand Down
2 changes: 1 addition & 1 deletion webpack/config/getHttpsConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const fs = require('fs')
const path = require('path')
const crypto = require('crypto')
const chalk = require('react-dev-utils/chalk')
const chalk = require('chalk')
const paths = require('./paths')

// Ensure the certificate and key provided are valid and if not
Expand Down
2 changes: 1 addition & 1 deletion webpack/config/modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const fs = require('fs')
const path = require('path')
const paths = require('./paths')
const chalk = require('react-dev-utils/chalk')
const chalk = require('chalk')
const resolve = require('resolve')

/**
Expand Down
17 changes: 1 addition & 16 deletions webpack/config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,7 @@ module.exports = function (webpackEnv) {
: isEnvDevelopment &&
(info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
},
cache: {
type: 'filesystem',
version: createEnvironmentHash(env.raw),
cacheDirectory: paths.appWebpackCache,
store: 'pack',
buildDependencies: {
defaultWebpack: ['webpack/lib/'],
config: [__filename],
tsconfig: [paths.appTsConfig, paths.appJsConfig].filter(f =>
fs.existsSync(f),
),
},
},
infrastructureLogging: {
level: 'none',
},

resolve: {
// This allows you to set a fallback for where webpack should look for
// modules. We placed these paths second because we want `node_modules`
Expand Down
131 changes: 0 additions & 131 deletions webpack/config/webpackDevServer.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion webpack/scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ process.on('unhandledRejection', err => {
require('../config/env')

const path = require('path')
const chalk = require('react-dev-utils/chalk')
const chalk = require('chalk')
const fs = require('fs-extra')
const webpack = require('webpack')
const paths = require('../config/paths')
Expand Down
34 changes: 3 additions & 31 deletions webpack/scripts/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,21 @@ process.on('unhandledRejection', err => {
require('../config/env')

const fs = require('fs')
const chalk = require('react-dev-utils/chalk')
const chalk = require('chalk')
const webpack = require('webpack')
const WebpackDevServer = require('webpack-dev-server')
const clearConsole = require('react-dev-utils/clearConsole')
const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles')
const {
choosePort,
createCompiler,
prepareProxy,
prepareUrls,
} = require('react-dev-utils/WebpackDevServerUtils')
const clearConsole = require('react-dev-utils/clearConsole')
const openBrowser = require('react-dev-utils/openBrowser')
const semver = require('semver')
const paths = require('../config/paths')
const createDevServerConfig = require('../config/webpackDevServer.config')
const getClientEnvironment = require('../config/env')
const react = require(require.resolve('react', { paths: [paths.appPath] }))

const env = getClientEnvironment(paths.publicUrlOrPath.slice(0, -1))
const useYarn = fs.existsSync(paths.yarnLockFile)
const isInteractive = process.stdout.isTTY

// Warn and crash if required files are missing
if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
process.exit(1)
}

// Tools like Cloud9 rely on this.
const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000
const HOST = process.env.HOST || '0.0.0.0'
Expand Down Expand Up @@ -95,16 +83,9 @@ module.exports = function (config) {
useTypeScript,
webpack,
})
// Load proxy config
const proxySetting = require(paths.appPackageJson).proxy
const proxyConfig = prepareProxy(
proxySetting,
paths.appPublic,
paths.publicUrlOrPath,
)

// Serve webpack assets generated by the compiler over a web server.
const serverConfig = {
...createDevServerConfig(proxyConfig, urls.lanUrlForConfig),
host: HOST,
port,
}
Expand All @@ -115,15 +96,6 @@ module.exports = function (config) {
clearConsole()
}

if (env.raw.FAST_REFRESH && semver.lt(react.version, '16.10.0')) {
console.log(
chalk.yellow(
`Fast Refresh requires React 16.10 or higher. You are using React ${react.version}.`,
),
)
}

console.log(chalk.cyan('Starting the development server...\n'))
openBrowser(urls.localUrlForBrowser)
})
;['SIGINT', 'SIGTERM'].forEach(function (sig) {
Expand Down
Loading
Loading