Skip to content

Commit

Permalink
Update npm packages (#733)
Browse files Browse the repository at this point in the history
First commit

- most major updates
- minor & patch updates
- ensure `volta` is extended to each `package.json`
- remove unused `package-lock.json` files from each extension
- update linting

Next 5 commits are updates from ERB (electron-react-boilerplate) package which this repo is based on.

Note:

- delete `node_modules/electron` before `npm i`
  • Loading branch information
irahopkinson authored Jan 25, 2024
2 parents 7c4aa8a + 5c44e3d commit 258021f
Show file tree
Hide file tree
Showing 62 changed files with 9,947 additions and 32,123 deletions.
9 changes: 2 additions & 7 deletions .erb/configs/webpack.config.renderer.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,7 @@ const configuration: webpack.Configuration = {

optimization: {
minimize: true,
minimizer: [
new TerserPlugin({
parallel: true,
}),
new CssMinimizerPlugin(),
],
minimizer: [new TerserPlugin(), new CssMinimizerPlugin()],
},

plugins: [
Expand Down Expand Up @@ -130,7 +125,7 @@ const configuration: webpack.Configuration = {
removeComments: true,
},
isBrowser: false,
isDevelopment: process.env.NODE_ENV !== 'production',
isDevelopment: false,
}),

new webpack.DefinePlugin({
Expand Down
24 changes: 24 additions & 0 deletions .erb/scripts/check-build-exists.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Check if the renderer and main bundles are built
import path from 'path';
import chalk from 'chalk';
import fs from 'fs';
import webpackPaths from '../configs/webpack.paths';

const mainPath = path.join(webpackPaths.distMainPath, 'main.js');
const rendererPath = path.join(webpackPaths.distRendererPath, 'renderer.js');

if (!fs.existsSync(mainPath)) {
throw new Error(
chalk.whiteBright.bgRed.bold(
'The main process is not built yet. Build it by running "npm run build:main"',
),
);
}

if (!fs.existsSync(rendererPath)) {
throw new Error(
chalk.whiteBright.bgRed.bold(
'The renderer process is not built yet. Build it by running "npm run build:renderer"',
),
);
}
2 changes: 1 addition & 1 deletion .erb/scripts/check-port-in-use.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import detectPort from 'detect-port';

const port = process.env.PORT || '1212';

detectPort(port, (err, availablePort) => {
detectPort(port, (_err, availablePort) => {
if (port !== String(availablePort)) {
throw new Error(
chalk.whiteBright.bgRed.bold(
Expand Down
8 changes: 5 additions & 3 deletions .erb/scripts/notarize.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ exports.default = async function notarizeMacos(context) {
return;
}

if (!('APPLE_ID' in process.env && 'APPLE_ID_PASS' in process.env)) {
console.warn('Skipping notarizing step. APPLE_ID and APPLE_ID_PASS env variables must be set');
if (!('APPLE_ID' in process.env && 'APPLE_APP_SPECIFIC_PASSWORD' in process.env)) {
console.warn(
'Skipping notarizing step. APPLE_ID and APPLE_APP_SPECIFIC_PASSWORD env variables must be set',
);
return;
}

Expand All @@ -23,6 +25,6 @@ exports.default = async function notarizeMacos(context) {
appBundleId: build.appId,
appPath: `${appOutDir}/${appName}.app`,
appleId: process.env.APPLE_ID,
appleIdPassword: process.env.APPLE_ID_PASS,
appleIdPassword: process.env.APPLE_APP_SPECIFIC_PASSWORD,
});
};
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ module.exports = {
globalThis: 'readonly',
},
parserOptions: {
ecmaVersion: 2020,
ecmaVersion: 2022,
sourceType: 'module',
project: './tsconfig.json',
project: './tsconfig.lint.json',
tsconfigRootDir: __dirname,
createDefaultProgram: true,
},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
env:
# These values are used for auto updates signing
# APPLE_ID: ${{ secrets.APPLE_ID }}
# APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
# APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASS }}
# CSC_LINK: ${{ secrets.CSC_LINK }}
# CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
# This is used for uploading release assets to github
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
if: ${{ matrix.os == 'macos-latest' }}
run: npm install dmg-license

- name: dotnet build
run: npm run build:data-release
- name: Build
run: npm run build

- name: run dotnet unit tests
run: dotnet test c-sharp-tests/c-sharp-tests.csproj
Expand Down
1 change: 0 additions & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const config: StorybookConfig = {
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
'@storybook/addon-actions',
],
framework: {
name: '@storybook/react-webpack5',
Expand Down
1 change: 0 additions & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module.exports = {
],
rules: {
'color-named': null,
'function-parentheses-space-inside': null,
'max-nesting-depth': 2,
'no-descending-specificity': null,
'selector-max-compound-selectors': 4,
Expand Down
4 changes: 2 additions & 2 deletions extensions/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ module.exports = {
},
],
parserOptions: {
ecmaVersion: 2020,
ecmaVersion: 2022,
sourceType: 'module',
project: './tsconfig.json',
project: './tsconfig.lint.json',
tsconfigRootDir: __dirname,
createDefaultProgram: true,
},
Expand Down
1 change: 0 additions & 1 deletion extensions/.stylelintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module.exports = {
],
rules: {
'color-named': null,
'function-parentheses-space-inside': null,
'max-nesting-depth': 2,
'no-descending-specificity': null,
'selector-max-compound-selectors': 4,
Expand Down
Loading

0 comments on commit 258021f

Please sign in to comment.