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

chore(client): move everything in root but electron to the client subfolder #1945

Merged
merged 22 commits into from
Apr 4, 2024

Conversation

daniellacosse
Copy link
Contributor

@daniellacosse daniellacosse commented Apr 1, 2024

I was able to successfully move the client into its own subfolder:

Screenshot 2024-02-12 at 1 49 21 PM

codeql is complaining because it's being triggered on the moved files. should I ignore it?

@daniellacosse daniellacosse changed the title chore(client): move the client to its own subfolder chore(client): move everything in src but electron to the client subfolder Apr 1, 2024
Copy link
Collaborator

@fortuna fortuna left a 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,

third_party/jsign/index.mjs Outdated Show resolved Hide resolved
client/src/build/download_file.mjs Outdated Show resolved Hide resolved
client/src/build/get_root_dir.mjs Outdated Show resolved Hide resolved
.github/workflows/build_and_test_debug_client.yml Outdated Show resolved Hide resolved
@daniellacosse daniellacosse changed the title chore(client): move everything in src but electron to the client subfolder chore(client): move everything in root but electron to the client subfolder Apr 1, 2024
@daniellacosse daniellacosse force-pushed the daniellacosse/contain_cordova_3 branch from 12629b4 to 1276015 Compare April 2, 2024 15:11
list.action.mjs Outdated Show resolved Hide resolved
@daniellacosse daniellacosse marked this pull request as ready for review April 3, 2024 19:58
@daniellacosse daniellacosse requested review from a team as code owners April 3, 2024 19:58
.gitignore Outdated Show resolved Hide resolved
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';
Copy link
Collaborator

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.

Copy link
Contributor Author

@daniellacosse daniellacosse Apr 3, 2024

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?

commitlint.config.js Outdated Show resolved Hide resolved
client/src/www/ui_components/user-comms-dialog.js Outdated Show resolved Hide resolved
client/LICENSE Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
client/src/www/ui_components/app-root.js Show resolved Hide resolved
client/src/www/ui_components/app-root.js Outdated Show resolved Hide resolved
return [navigator.language];
}

window.OutlineI18n = {
Copy link
Collaborator

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Collaborator

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.

Copy link
Collaborator

@fortuna fortuna left a 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

client/src/cordova/android/import_messages.mjs Outdated Show resolved Hide resolved
return [navigator.language];
}

window.OutlineI18n = {
Copy link
Collaborator

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.

client/src/www/ui_components/app-root.js Outdated Show resolved Hide resolved
client/src/www/ui_components/add-server-view.js Outdated Show resolved Hide resolved
client/src/www/app/settings.ts Show resolved Hide resolved
Copy link
Collaborator

@fortuna fortuna left a 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

Copy link
Collaborator

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?

Copy link
Contributor Author

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.

@daniellacosse daniellacosse merged commit 341e6d7 into master Apr 4, 2024
18 of 19 checks passed
@daniellacosse daniellacosse deleted the daniellacosse/contain_cordova_3 branch April 4, 2024 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants