fix: intel mac proxy #467
Merged
fix: intel mac proxy #467
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
forge.config.ts
Outdated
Comment on lines
12
to
21
| let resources = [ | ||
| './resources/' + getPlatform() + '/' + getArch(), | ||
| ] | ||
|
|
||
| if (getPlatform() === 'mac') { | ||
| resources = [ | ||
| './resources/mac/arm64', | ||
| './resources/mac/x86_64', | ||
| ] | ||
| } |
There was a problem hiding this comment.
Nit: I'm not a big fan of reassigning variables, so wanted to suggest an alternative:
function getPlatformSpecificResources() {
if (getPlatform() === 'mac') {
return ['./resources/mac/arm64', './resources/mac/x86_64']
}
return ['./resources/' + getPlatform() + '/' + getArch()]
}
const config: ForgeConfig = {
// ...
extraResource: [
// ...
...getPlatformSpecificResources()
]
}
forge.config.ts
Outdated
| @@ -9,6 +9,17 @@ import { FusesPlugin } from '@electron-forge/plugin-fuses' | |||
| import { FuseV1Options, FuseVersion } from '@electron/fuses' | |||
| import { getPlatform, getArch } from './src/utils/electron' | |||
|
|
|||
| let resources = [ | |||
| './resources/' + getPlatform() + '/' + getArch(), | |||
There was a problem hiding this comment.
Can we use path.join('./resources', getPlatform(), getArch())?
There was a problem hiding this comment.
makes absolutely more sense :D
package.json
Outdated
| @@ -1,7 +1,7 @@ | |||
| { | |||
| "name": "k6-studio", | |||
| "productName": "k6 Studio", | |||
| "version": "0.12.0", | |||
| "version": "0.13.0", | |||
There was a problem hiding this comment.
This doesn't seem right 👀
There was a problem hiding this comment.
this is just for testing and will be reverted before the PR gets merged 🙇
This reverts commit e3a76c5.
Closed
This was referenced Feb 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix #460
Fix #486
The build for both mac architectures is done on an arm machine and that would make the packager packager only the
arm64folder even on anx86_64architecture, this PR fixes that by including both folders on mac with a small cost of71~MBincrease of application sizeHow to Test
Checklist
npm run lint) and all checks pass.npm test) and all tests pass.Screenshots (if appropriate):
Related PR(s)/Issue(s)