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

Jump to bottom

Update electron to 31.7.0 #1166

Merged
merged 5 commits into from
Oct 17, 2024
+428 −286
Merged

Update electron to 31.7.0 #1166

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dccd2e6
Update electron to 31.7.0
whitphx Oct 17, 2024
b6df478
Update
whitphx Oct 17, 2024
b94bc90
Update
whitphx Oct 17, 2024
9545290
Merge branch 'main' into dev/desktop-electron-31.7.0
whitphx Oct 17, 2024
c10d56f
Move the step checking electron-builder to the e2e-desktop job
whitphx Oct 17, 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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,8 @@ jobs:
make desktop

- name: Check if electron-builder works
working-directory: packages/desktop
run: yarn run pack
working-directory: packages/desktop/samples/basic
run: yarn run app:dir

- name: Package
working-directory: packages/desktop
Expand Down
6 changes: 3 additions & 3 deletions packages/desktop/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Convert your [Streamlit](https://streamlit.io/) application into a desktop app w
"scripts": {
"dump": "dump-stlite-desktop-artifacts",
"serve": "cross-env NODE_ENV=production electron .",
"pack": "electron-builder --dir",
"dist": "electron-builder",
"app:dir": "electron-builder --dir",
"app:dist": "electron-builder",
Copy link
Owner Author

Choose a reason for hiding this comment

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

Follow electron-userland/electron-builder#6510

"postinstall": "electron-builder install-app-deps"
},
"build": {
Expand Down Expand Up @@ -85,7 +85,7 @@ Convert your [Streamlit](https://streamlit.io/) application into a desktop app w
- This `dump` command creates `./build` directory that contains the copied Streamlit app files, dumped installed packages, Pyodide runtime, Electron app files, etc.
7. Run `npm run serve` or `yarn serve` for preview.
- This command is just a wrapper of `electron` command as you can see at the `"scripts"` field in the `package.json`. It launches Electron and starts the app with `./build/electron/main.js`, which is specified at the `"main"` field in the `package.json`.
8. Run `npm run dist` or `yarn dist` for packaging.
8. Run `npm run app:dist` or `yarn app:dist` for packaging.
- This command bundles the `./build` directory created in the step above into application files (`.app`, `.exe`, `.dmg` etc.) in the `./dist` directory. To customize the built app, e.g. setting the icon, follow the [`electron-builder`](https://www.electron.build/) instructions.

See the [./samples](./samples) directory for sample projects.
Expand Down
4 changes: 0 additions & 4 deletions packages/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
"dump:dev": "ts-node ./bin-src/dump_artifacts/index.ts",
"dump": "dump-stlite-desktop-artifacts",
"serve": "cross-env NODE_ENV=production electron .",
"pack": "electron-builder --dir",
"dist": "electron-builder",
"fix:eslint": "eslint --fix '{src,electron,bin}/**/*.{ts,tsx}'",
"fix:prettier": "prettier --write .",
"check:eslint": "eslint '{src,electron,bin}/**/*.{ts,tsx}'",
Expand Down Expand Up @@ -81,8 +79,6 @@
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"@types/yargs": "^17.0.32",
"electron": "30.0.8",
"electron-builder": "^24.13.2",
"electron-reload": "^2.0.0-alpha.1",
"esbuild": "^0.20.0",
"glob": "^10.3.12",
Expand Down
8 changes: 4 additions & 4 deletions packages/desktop/samples/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"scripts": {
"dump": "dump-stlite-desktop-artifacts",
"serve": "cross-env NODE_ENV=production electron .",
"pack": "electron-builder --dir",
"dist": "electron-builder"
"app:dir": "electron-builder --dir",
"app:dist": "electron-builder"
},
"build": {
"files": [
Expand All @@ -20,8 +20,8 @@
"devDependencies": {
"@stlite/desktop": "^0.69.2",
"cross-env": "^7.0.3",
"electron": "30.0.8",
"electron-builder": "^24.9.1"
"electron": "31.7.0",
"electron-builder": "^25.1.7"
},
"stlite": {
"desktop": {
Expand Down
8 changes: 4 additions & 4 deletions packages/desktop/samples/file-persistence-idbfs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"scripts": {
"dump": "dump-stlite-desktop-artifacts",
"serve": "cross-env NODE_ENV=production electron .",
"pack": "electron-builder --dir",
"dist": "electron-builder"
"app:dir": "electron-builder --dir",
"app:dist": "electron-builder"
},
"build": {
"files": [
Expand All @@ -20,8 +20,8 @@
"devDependencies": {
"@stlite/desktop": "^0.69.2",
"cross-env": "^7.0.3",
"electron": "30.0.8",
"electron-builder": "^24.9.1"
"electron": "31.7.0",
"electron-builder": "^25.1.7"
},
"stlite": {
"desktop": {
Expand Down
8 changes: 4 additions & 4 deletions packages/desktop/samples/file-persistence-nodefs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"scripts": {
"dump": "dump-stlite-desktop-artifacts",
"serve": "cross-env NODE_ENV=production electron .",
"pack": "electron-builder --dir",
"dist": "electron-builder"
"app:dir": "electron-builder --dir",
"app:dist": "electron-builder"
},
"build": {
"files": [
Expand All @@ -20,8 +20,8 @@
"devDependencies": {
"@stlite/desktop": "^0.69.2",
"cross-env": "^7.0.3",
"electron": "30.0.8",
"electron-builder": "^24.9.1"
"electron": "31.7.0",
"electron-builder": "^25.1.7"
},
"stlite": {
"desktop": {
Expand Down
Loading
Loading