-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
chore(client): move everything in root but electron to the client subfolder #1945
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like there needs to be some smaller changes first,
12629b4
to
1276015
Compare
import {ShadowsocksSessionConfig} from '../www/app/tunnel'; | ||
import {TunnelStatus} from '../www/app/tunnel'; | ||
import {ErrorCode, fromErrorCode, UnexpectedPluginError} from '../www/model/errors'; | ||
import {pathToEmbeddedBinary} from '../../client/src/infrastructure/electron/app_paths'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not for this PR, but infrastructure should move out of the client eventually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes - so far I have five cleanup steps to do after this is merged:
- move src/electron into client
- remove client/src
- collapse all the output/build folders into one that's in the root (non-trivial with cordova, but I have an idea)
- create an infrastructure package and move src/build and client/src/infrastructure into it
- move outline/device into client/tun2socks and rename it to client/backend
Anything I'm forgetting?
return [navigator.language]; | ||
} | ||
|
||
window.OutlineI18n = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you setting this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm replacing the archived https://github.com/Jigsaw-Code/outline-i18n
It's only used here, it's not in the manager: https://github.com/search?q=repo%3AJigsaw-Code%2Foutline-apps%20outline-i18n&type=code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it's only used here, why to you need to mess with window
?
Just call the getBestMatchingLanguage
method directly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe a bug was introduced in import_messages
return [navigator.language]; | ||
} | ||
|
||
window.OutlineI18n = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it's only used here, why to you need to mess with window
?
Just call the getBestMatchingLanguage
method directly.
Co-authored-by: Vinicius Fortuna <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! Thanks for the clean up
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see some icons being added. What happened?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We had to revert the icons in order to upload iOS, which caused a bunch of conflicts in this PR, so I had to resolve that.
I was able to successfully move the client into its own subfolder:
codeql is complaining because it's being triggered on the moved files. should I ignore it?