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 all npm dependencies (2021-12-05) #1449

Merged
merged 12 commits into from
Dec 6, 2021
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/prs-lint-build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: '14'
node-version: '16'
- name: Install dependencies
run: npm ci
- name: Check package-lock.json
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pipeline {
// Parameters used by the github releases script
GITHUB_OWNER='realm'
GITHUB_REPO='realm-studio'
NODE_VERSION='14'
NODE_VERSION='16'
}

parameters {
Expand Down
2 changes: 1 addition & 1 deletion RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

### Internals

- None
- Upgrading all dependencies, including Electron to v16 and Bootstrap to v5 ([#1449](https://github.com/realm/realm-studio/pull/1449))
15 changes: 4 additions & 11 deletions configs/webpack.main.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ module.exports = (env, argv) => {
const baseConfig = require('./webpack.base.js')(env, argv);

return merge(baseConfig, {
devServer: isDevelopment
? {
hot: true,
inline: true,
}
: {},
entry: isDevelopment
? ['webpack/hot/poll?1000', './src/main.ts']
: ['./src/main.ts'],
Expand All @@ -31,10 +25,6 @@ module.exports = (env, argv) => {
test: /\.(scss|svg|png)$/,
use: 'null-loader',
},
{
test: /\.md$/,
use: 'file-loader',
},
],
},
output: {
Expand All @@ -44,7 +34,10 @@ module.exports = (env, argv) => {
},
plugins: [
// Prevent the windows from loading the UI components
new webpack.IgnorePlugin(/\/ui/, /\/src\/windows$/),
new webpack.IgnorePlugin({
resourceRegExp: /\/ui/,
contextRegExp: /\/src\/windows$/,
}),
],
target: 'electron-main',
watch: isDevelopment,
Expand Down
14 changes: 2 additions & 12 deletions configs/webpack.renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ module.exports = (env, argv) => {
const baseConfig = require('./webpack.base.js')(env, argv);

return merge(baseConfig, {
devServer: isDevelopment
? {
hot: true,
inline: true,
}
: {},
entry: {
renderer: './src/renderer.tsx',
sentry: './src/sentry.ts',
Expand All @@ -39,7 +33,7 @@ module.exports = (env, argv) => {
},
{
test: /\.(jpe?g|png|gif)$/i,
use: ['file-loader'],
type: 'asset/resource',
},
{
test: /\.svg$/,
Expand All @@ -48,13 +42,9 @@ module.exports = (env, argv) => {
},
{
test: /\.(eot|svg|ttf|woff|woff2)$/,
use: 'file-loader',
type: 'asset/resource',
exclude: path.resolve(__dirname, '../static/svgs'),
},
{
test: /\.md$/,
use: 'file-loader',
},
],
},
output: {
Expand Down
6 changes: 0 additions & 6 deletions docs/DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,3 @@ We're on Electron v11 and consequently spectron v13.
Upgrading introduce a couple of breaking changes that require attention:
- [v12 breaking changes](https://www.electronjs.org/releases/stable?version=12&page=3#breaking-changes-1200)
- [v13 breaking changes](https://www.electronjs.org/releases/stable?version=13&page=2#breaking-changes-1300)

## Bootstrap

The components of the project was built around Bootstrap v4.

Instead of upgrading to v5 we'll probably adopt [the MongoDB design system](https://www.mongodb.design/).
Loading