Skip to content

Commit

Permalink
#216 monorepo app assets
Browse files Browse the repository at this point in the history
  • Loading branch information
joepio committed Jul 25, 2023
1 parent d4a0443 commit e748f10
Show file tree
Hide file tree
Showing 48 changed files with 84 additions and 867 deletions.
7 changes: 6 additions & 1 deletion .vscode/recommendations.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"recommendations": [
"matklad.rust-analyzer"
"matklad.rust-analyzer",
"sakamoto66.vscode-playwright-test-runner",
"ms-vscode.vscode-typescript-next",
"dbaeumer.vscode-eslint",
"antfu.vite",
"ms-playwright.playwright"
]
}
35 changes: 34 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,38 @@
// The linter in the CI is quite strict, so running `cargo fmt` on save is probably a good idea!
"editor.formatOnSave": true,
"files.autoSave": "onFocusChange",
"rust-analyzer.checkOnSave.command": "clippy"
"rust-analyzer.checkOnSave.command": "clippy",
"editor.rulers": [
80
],
"search.exclude": {
"**/.git": true,
"**/node_modules": true,
"**/build": true,
"**/coverage": true,
"**/dist": true,
},
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"typescript.preferences.importModuleSpecifierEnding": "minimal",
"eslint.alwaysShowStatus": true,
"eslint.format.enable": true,
"eslint.lintTask.enable": true,
"eslint.packageManager": "pnpm",
"eslint.quiet": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
},
"jest.enableInlineErrorMessages": true,
"jest.showCoverageOnLoad": true,
"jest.runAllTestsFirst": false,
"eslint.workingDirectories": [
"./data-browser",
"./react",
"./lib"
]
}
26 changes: 25 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,30 @@
"command": "docker run -d -e COLLECTOR_ZIPKIN_HTTP_PORT=9411 -p 5775:5775/udp -p 6831:6831/udp -p 6832:6832/udp -p 5778:5778 -p 16686:16686 -p 14268:14268 -p 9411:9411 jaegertracing/all-in-one",
"group": "none",
"problemMatcher": []
}
},
{
"type": "npm",
"script": "start",
"problemMatcher": [
"$tsc-watch"
],
"label": "run data-browser dev server (pnpm start)",
"detail": "pnpm workspace @tomic/data-browser start",
"isBackground": true,
"path": "browser",
"group": "build"
},
{
"type": "npm",
"script": "test",
"problemMatcher": [
"$tsc-watch"
],
"label": "test data-browser",
"path": "browser",
"detail": "pnpm test",
"isBackground": true,
"group": "test"
},
]
}
File renamed without changes.
11 changes: 0 additions & 11 deletions CONTRIBUTE.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Check out the [Roadmap](https://docs.atomicdata.dev/roadmap.html) if you want to
- [Drill](#drill)
- [Responsible disclosure / Coordinated Vulnerability Disclosure](#responsible-disclosure--coordinated-vulnerability-disclosure)
- [Releases, Versioning and Tagging](#releases-versioning-and-tagging)
- [Including JS app\_assets](#including-js-app_assets)
- [Publishing manually - doing the CI's work](#publishing-manually---doing-the-cis-work)
- [Building and publishing binaries](#building-and-publishing-binaries)
- [Publishing to Cargo](#publishing-to-cargo)
Expand Down Expand Up @@ -188,16 +187,6 @@ Note:
- The version for `atomic-lib` is the most important, and dictates the versions of `cli` and `server`. When `lib` changes minor version, `cli` and `server` should follow.
- After publishing, update the `./desktop/latest-version.json` file. This is used for auto-updating desktop distributions. See [tauri docs](https://tauri.studio/docs/distribution/updater).

### Including JS app_assets

Before tagging a new version, make sure to update the `app_assets` folder:

1. Go up one directory from `atomic-server` => `cd ..`
2. In here, clone [atomic-data-browser](https://github.com/atomicdata-dev/atomic-data-browser)
3. Run `./build-server.sh` to compile assets and copy them to your `app_assets` directory
4. Make sure not to commit all the files, manually check them
5. search and replace `.workbox` with `./app_assets/workbox` in `sw.js`, because we'll host `sw.js` from root.

### Publishing manually - doing the CI's work

If the CI scripts for some reason do not do their job (buildin releases, docker file, publishing to cargo), you can follow these instructions:
Expand Down
9 changes: 0 additions & 9 deletions browser/.vscode/extensions.json

This file was deleted.

36 changes: 0 additions & 36 deletions browser/.vscode/settings.json

This file was deleted.

32 changes: 1 addition & 31 deletions browser/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,4 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"problemMatcher": [
"$tsc-watch"
],
"label": "run data-browser dev server (pnpm start)",
"detail": "pnpm workspace @tomic/data-browser start",
"isBackground": true,
"group": "build"
},
{
"type": "npm",
"script": "test",
"problemMatcher": [
"$tsc-watch"
],
"label": "test data-browser",
"detail": "pnpm test",
"isBackground": true,
"group": "test"
},
{
"type": "shell",
"command": "./build_server.sh",
"label": "build server JS assets",
"isBackground": true,
"group": "build"
}
]
"tasks": []
}
9 changes: 0 additions & 9 deletions browser/build_server.sh

This file was deleted.

Binary file added browser/bun.lockb
Binary file not shown.
4 changes: 0 additions & 4 deletions server/app_assets/_config.yml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed server/app_assets/app_data/images/favicon-16x16.png
Binary file not shown.
Binary file removed server/app_assets/app_data/images/favicon-32x32.png
Binary file not shown.
Binary file removed server/app_assets/app_data/images/favicon.ico
Binary file not shown.
Binary file removed server/app_assets/app_data/images/icon.png
Binary file not shown.
27 changes: 0 additions & 27 deletions server/app_assets/app_data/images/mask-icon.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed server/app_assets/app_data/images/mstile-144x144.png
Binary file not shown.
Binary file removed server/app_assets/app_data/images/mstile-150x150.png
Binary file not shown.
Binary file removed server/app_assets/app_data/images/mstile-310x150.png
Binary file not shown.
Binary file removed server/app_assets/app_data/images/mstile-310x310.png
Binary file not shown.
Binary file removed server/app_assets/app_data/images/mstile-70x70.png
Binary file not shown.
1 change: 0 additions & 1 deletion server/app_assets/assets/index.css

This file was deleted.

Loading

0 comments on commit e748f10

Please sign in to comment.