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

fix(client): update more broken paths #2019

Merged
merged 4 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
30 changes: 15 additions & 15 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,34 +28,34 @@
// Similar to above but for src/www/model, but you can use files from both the
// src/www/model and src/www/infrastructure paths.
{
"target": "./src/www/model",
"target": "./client/src/wwwmodel",
sbruens marked this conversation as resolved.
Show resolved Hide resolved
"from": ".",
"except": ["./src/www/model", "./src/infrastructure", "./node_modules"]
"except": ["./client/src/wwwmodel", "./src/infrastructure", "./node_modules"]
},
// Prevents the internals of the outline_server_repository from being used publicly in the app.
{
"target": "./src/www/app/*.ts",
"from": "./src/www/app/outline_server_repository/server.ts"
"target": "./client/src/wwwapp/*.ts",
"from": "./client/src/wwwapp/outline_server_repository/server.ts"
},
{
"target": "./src/www/app/*.ts",
"from": "./src/www/app/outline_server_repository/access_key_serialization.ts"
"target": "./client/src/wwwapp/*.ts",
"from": "./client/src/wwwapp/outline_server_repository/access_key_serialization.ts"
},
{
"target": "./src/www/views",
"from": "./src/www/model"
"target": "./client/src/wwwviews",
"from": "./client/src/wwwmodel"
},
{
"target": "./src/www/ui_components",
"from": "./src/www/model"
"target": "./client/src/wwwui_components",
"from": "./client/src/wwwmodel"
},
{
"target": "./src/www/views",
"from": "./src/www/app"
"target": "./client/src/wwwviews",
"from": "./client/src/wwwapp"
},
{
"target": "./src/www/ui_components",
"from": "./src/www/app"
"target": "./client/src/wwwui_components",
"from": "./client/src/wwwapp"
}
]
}
Expand Down Expand Up @@ -117,7 +117,7 @@
},
// No need to check browser compatibility for electron files
{
"files": ["./src/www/app/electron_main.ts"],
"files": ["./client/src/wwwapp/electron_main.ts"],
"rules": {
"compat/compat": "off"
}
Expand Down
6 changes: 3 additions & 3 deletions client/src/cordova/android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ Additional requirements for Android:
To build for android, run:

```sh
npm run action cordova/build android
npm run action client/src/cordova/build android
```

We also support passing a `--verbose` option on cordova android:

```sh
npm run action cordova/build android -- --verbose
npm run action client/src/cordova/build android -- --verbose
```

Make sure to rebuild after modifying platform dependent files!
Expand All @@ -48,7 +48,7 @@ A Docker image with all pre-requisites for Android builds is included. To build:
### To install the APK

- Connect an Android device and enable [USB debugging](https://developer.android.com/studio/debug/dev-options.html#enable).
- Build the app, with `npm run action cordova/build android`
- Build the app, with `npm run action client/src/cordova/build android`
- From the project root, run: `adb install -r -d platforms/android/app/build/outputs/apk/<processor>/debug/app-<processor>-debug.apk`

### To debug the web app on Android
Expand Down
6 changes: 3 additions & 3 deletions client/src/cordova/apple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ You will need:

## Set up XCode project

The XCode project is created by Cordova. To create the project and open it on XCode, use `npm run action cordova/setup $PLATFORM`, then open the XCode workspace file (not the project).
The XCode project is created by Cordova. To create the project and open it on XCode, use `npm run action client/src/cordova/setup $PLATFORM`, then open the XCode workspace file (not the project).

For the **iOS** client and **Mac Catalyst** client:

```sh
npm run action cordova/build ios && open ./src/cordova/apple/ios.xcworkspace
npm run action client/src/cordova/build ios && open ./client/src/cordova/apple/ios.xcworkspace
```

For the **macOS** client:

```sh
SENTRY_DSN=https://[email protected]/1 npm run action cordova/setup macos -- --buildMode=release --versionName=0.0.0-dev && open ./src/cordova/apple/macos.xcworkspace
SENTRY_DSN=https://[email protected]/1 npm run action client/src/cordova/setup macos -- --buildMode=release --versionName=0.0.0-dev && open ./client/src/cordova/apple/macos.xcworkspace
```

> **Note** On Apple Silicon the macOS web UI is broken in debug mode, so we need to build it in release mode. We are specifying a fake `SENTRY_DSN`, you should specify your own in your releases.
Expand Down
4 changes: 2 additions & 2 deletions client/src/www/ui_components/licenses/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

- `cd` to the root of your clone of this repo.
- Ensure `node_modules` is up to date by running `npm ci`.
- `npx generate-license-file --input package.json --output src/www/ui_components/licenses/licenses.txt`
- `./src/www/ui_components/licenses/third_party.sh >> ./src/www/ui_components/licenses/licenses.txt`
- `npx generate-license-file --input package.json --output client/src/www/ui_components/licenses/licenses.txt`
- `./client/src/www/ui_components/licenses/third_party.sh >> ./client/src/www/ui_components/licenses/licenses.txt`

Done!
Loading