Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: holium/realm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.16.1
Choose a base ref
...
head repository: holium/realm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jul 24, 2023

  1. RE-309 invites open option for group chat, pasting chat path displays…

    … as space block with join button
    Tenari committed Jul 24, 2023
    Copy the full SHA
    60271aa View commit details

Commits on Jul 28, 2023

  1. put os-notes in the app catalog on-load of the bazaar agent

    Patrick Bergeron committed Jul 28, 2023
    Copy the full SHA
    1447b10 View commit details
  2. added icon image from Trent

    Patrick Bergeron committed Jul 28, 2023
    Copy the full SHA
    ae70888 View commit details
  3. New notes Icon

    gdbroman committed Jul 28, 2023
    Copy the full SHA
    3d9868e View commit details
  4. replaced full notes app icon url to 'AppIconNotes'

    Patrick Bergeron committed Jul 28, 2023
    Copy the full SHA
    56d3924 View commit details
  5. update background color based on new color value from gus

    Patrick Bergeron committed Jul 28, 2023
    Copy the full SHA
    a9a0a3e View commit details
  6. Merge pull request #1951 from holium/new-notes-icon

    New notes Icon
    gdbroman authored Jul 28, 2023
    Copy the full SHA
    fce7e14 View commit details
  7. Merge pull request #1952 from holium/bazaar-notes-on-load

    add %notes on load
    gdbroman authored Jul 28, 2023
    Copy the full SHA
    fe02a77 View commit details
  8. Copy the full SHA
    aa0811a View commit details
  9. Copy the full SHA
    c63bf0c View commit details
  10. Merge pull request #1954 from holium/app-grid-cleanups

    App grid cleanups
    gdbroman authored Jul 28, 2023
    Copy the full SHA
    aaf9bd0 View commit details

Commits on Jul 29, 2023

  1. Merge pull request #1957 from holium/revert-to-v0.16.0

    Revert to v0.16.0
    drunkplato authored Jul 29, 2023
    Copy the full SHA
    ba9b764 View commit details
  2. remove %os-notes %add-catalog-entry poke in the %bazaar on-load

    Patrick Bergeron committed Jul 29, 2023
    Copy the full SHA
    39b043b View commit details
  3. remove %os-notes %add-catalog-entry poke in the %bazaar on-load

    Patrick Bergeron committed Jul 29, 2023
    Copy the full SHA
    95a5b94 View commit details
  4. Copy the full SHA
    8507b14 View commit details

Commits on Jul 31, 2023

  1. stop wiping bedrock on-load

    Tenari committed Jul 31, 2023
    Copy the full SHA
    55bc279 View commit details
  2. Merge pull request #1961 from holium/stop-bedrock-wipe

    stop wiping bedrock on-load
    gdbroman authored Jul 31, 2023
    Copy the full SHA
    1d5ea05 View commit details
  3. RE-309 pr changes

    Tenari committed Jul 31, 2023
    Copy the full SHA
    db5763f View commit details

Commits on Aug 2, 2023

  1. rename options

    Tenari committed Aug 2, 2023
    Copy the full SHA
    7761f4b View commit details
  2. Merge pull request #1937 from holium/RE-309_realm-chat-paths

    RE-309 invites open option for group chat, pasting chat path displays…
    Tenari authored Aug 2, 2023
    1
    Copy the full SHA
    6e518dd View commit details

Commits on Aug 3, 2023

  1. Copy the full SHA
    d5d5f0f View commit details
  2. Merge pull request #1966 from holium/fix-lint-issue-in-master

    Add missing ourShip argument
    gdbroman authored Aug 3, 2023
    Copy the full SHA
    0a5bfcf View commit details
  3. fixes for new groups changes

    Patrick Bergeron committed Aug 3, 2023
    Copy the full SHA
    2b69eaa View commit details
  4. fixed minor bug where edit space dialog did not auto populate the spa…

    …ce name field when going thru the 'Make Space from Group' workflow
    Patrick Bergeron committed Aug 3, 2023
    Copy the full SHA
    2b9abc2 View commit details
  5. Merge pull request #1967 from holium/new-groups-fix

    %groups fixes
    subnet-arts authored Aug 3, 2023
    Copy the full SHA
    db22757 View commit details
  6. remove extraneous console.log and code cleanup

    Patrick Bergeron committed Aug 3, 2023
    Copy the full SHA
    5ef6e9e View commit details
  7. Merge pull request #1968 from holium/new-groups-fix

    remove extraneous console.log and code cleanup
    subnet-arts authored Aug 3, 2023
    Copy the full SHA
    e1d36ad View commit details
  8. Copy the full SHA
    b0ef470 View commit details
  9. Merge yjs updates before sending them to Bedrock

    Also rename notes_updates to notes_edits
    gdbroman committed Aug 3, 2023
    Copy the full SHA
    0030b0c View commit details
  10. Copy the full SHA
    4024714 View commit details
  11. Copy the full SHA
    1881ac5 View commit details
  12. Copy the full SHA
    25eb19d View commit details
  13. Fix const typos

    gdbroman committed Aug 3, 2023
    Copy the full SHA
    eb65c55 View commit details
  14. Copy the full SHA
    d655187 View commit details
  15. Copy the full SHA
    d81100b View commit details
  16. Fix Peer not open error

    gdbroman committed Aug 3, 2023
    Copy the full SHA
    3333dad View commit details
  17. Copy the full SHA
    04d4c06 View commit details
  18. Copy the full SHA
    320f26d View commit details
  19. Copy the full SHA
    f8f3ba4 View commit details
  20. Copy the full SHA
    d2240c9 View commit details
  21. Copy the full SHA
    cb2eed1 View commit details
  22. Copy the full SHA
    d58f4ef View commit details
  23. Copy the full SHA
    c0b2900 View commit details
  24. Remove lingering .splits

    gdbroman committed Aug 3, 2023
    Copy the full SHA
    84f4e20 View commit details
  25. Copy the full SHA
    31e7b73 View commit details
  26. Copy the full SHA
    bb1f24f View commit details
  27. Merge pull request #1962 from holium/RE-405-notes-cleanups

    Notes – cleanups
    gdbroman authored Aug 3, 2023
    Copy the full SHA
    bbe30b0 View commit details
  28. bedrock spaces paths syncing better

    Tenari authored and gdbroman committed Aug 3, 2023
    Copy the full SHA
    45a7505 View commit details
  29. handle del-row properly in notes

    Tenari authored and gdbroman committed Aug 3, 2023
    Copy the full SHA
    4dba226 View commit details
  30. Merge pull request #1964 from holium/bedrock-spaces-sync

    bedrock spaces paths syncing better
    gdbroman authored Aug 3, 2023
    Copy the full SHA
    3bcc484 View commit details
Showing 474 changed files with 4,751 additions and 24,099 deletions.
24 changes: 24 additions & 0 deletions .docs/CI.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
## Continuous Integration Notes

### Environment variables

Environment variables are set by CI differently between mac/linux and windows builds.

**On Max/Linux**

Webpack config files are used to set environment variables. mac/linux handles extensive command line argument passing and nesting better. This simplifies CI significantly because command line args can be specified directly in the workflow scripts.

To see how runtime environment variables are set for mac/linux, please refer to this file:

`app/.holium/configs/webpack.config.renderer.prod.ts`

The environment variable references found in this file are set during the CI/build process and are "baked" into the final deployment artifacts.

**On Windows**

Since Windows has trouble with extensive command line argument passing and nesting, Windows builds generate a .env file during CI and this file is incorporated into the final set of deployment artifacts. This ensures that all necessary/required environment variables are available at runtime.

To see how the .env file is generated for windows builds, refer to the build-windows jobs in the following files:

**production** - .github/workflows/production-build.yml
**staging** - .github/workflows/staging-build.yml
29 changes: 0 additions & 29 deletions .github/workflows/cypress.yml

This file was deleted.

145 changes: 77 additions & 68 deletions .github/workflows/production-build.yml
Original file line number Diff line number Diff line change
@@ -259,6 +259,7 @@ jobs:
BUILD_VERSION=$BUILD_VERSION
ARTIFACT_VERSION=$ARTIFACT_VERSION
RELEASE_CHANNEL=$RELEASE_CHANNEL
ROOMS_PROVIDER=litzod-dozzod-hostyv.holium.live
EOF
cd ../
sudo yarn package:release:win
@@ -332,79 +333,87 @@ jobs:
BUILD_VERSION: ${{ needs.pre-deploy.outputs.build_version }}
ARTIFACT_VERSION: ${{ needs.pre-deploy.outputs.artifact_version }}
#
deploy-desks:
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'build')
needs: [pre-deploy, build-mac, build-windows, build-linux]
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
ref: production
# Urbit symlink fetching
submodules: 'recursive'
#
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '>=18'
cache: 'npm'
#
- name: Bump desks version
uses: actions/github-script@v6
id: bump-desks
with:
script: |
const script = require('./.github/workflows/scripts/bump-desk-version.js')
console.log(process.env.CI_ENV)
console.log(script({github}, JSON.parse(process.env.CI_ENV), ['./desks/realm']))
env:
CI_ENV: ${{ needs.pre-deploy.outputs.ci }}
# publish latest agent udpates for realm, and usher
- name: Publish ship updates
run: |
mkdir -p ~/.ssh
# ensure private key
echo "$DEPLOY_RSA" >> ~/.ssh/usher_rsa
chmod 600 ~/.ssh/usher_rsa
ssh -v -i ~/.ssh/usher_rsa -o StrictHostKeyChecking=no $DEPLOY_USERNAME@$DEPLOY_HOST "rm -rf urbit/hostyv/realm/*"
scp -v -i ~/.ssh/usher_rsa -o StrictHostKeyChecking=no -r ./desks/realm/* $DEPLOY_USERNAME@$DEPLOY_HOST:./urbit/hostyv/realm
ssh -v -i ~/.ssh/usher_rsa -o StrictHostKeyChecking=no $DEPLOY_USERNAME@$DEPLOY_HOST "rm -rf urbit/hostyv/usher/*"
scp -v -i ~/.ssh/usher_rsa -o StrictHostKeyChecking=no -r ./desks/usher/* $DEPLOY_USERNAME@$DEPLOY_HOST:./urbit/hostyv/usher
env:
DEPLOY_USERNAME: ${{ secrets.DEPLOY_USERNAME }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
DEPLOY_RSA: ${{ secrets.DEPLOY_RSA }}
#
# poke remote endpoint in usher agent which will run clay commit
# see dirk: https://developers.urbit.org/reference/arvo/clay/examples#dirk
# for more information
- name: Deploy ship updates
uses: actions/github-script@v6
env:
DEPLOY_SHIP: ${{ secrets.DEPLOY_SHIP }}
DEPLOY_SHIP_CODE: ${{ secrets.DEPLOY_SHIP_CODE }}
DEPLOY_ROOT_URL: ${{ secrets.DEPLOY_ROOT_URL }}
with:
script: |
const script = require('./.github/workflows/scripts/deploy.js')
console.log(script({github}, {
ship: process.env.DEPLOY_SHIP,
code: process.env.DEPLOY_SHIP_CODE,
rootUrl: process.env.DEPLOY_ROOT_URL,
mounts: ['usher', 'realm']
}))
# Workaround to avoid "Post Run actions/setup-node" failures.
# See: https://codesti.com/issue/actions/setup-node/317
- run: mkdir -p /home/runner/.npm
continue-on-error: true
# deploy-desks:
# if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'build')
# needs: [pre-deploy, build-mac, build-windows, build-linux]
# runs-on: ubuntu-latest
# timeout-minutes: 30
# steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# ref: production
# # Urbit symlink fetching
# submodules: 'recursive'
# #
# - name: Setup node
# uses: actions/setup-node@v3
# with:
# node-version: '>=18'
# cache: 'npm'
# # .
# - name: Pull latest desks master
# run: |
# cd ./desks
# git checkout master
# git pull
# cd ..
# #
# - name: Bump desks version
# uses: actions/github-script@v6
# id: bump-desks
# with:
# script: |
# const script = require('./.github/workflows/scripts/bump-desk-version.js')
# console.log(process.env.CI_ENV)
# console.log(script({github}, JSON.parse(process.env.CI_ENV), ['./desks/realm']))
# env:
# CI_ENV: ${{ needs.pre-deploy.outputs.ci }}
# # publish latest agent udpates for realm, and usher
# - name: Publish ship updates
# continue-on-error: true
# run: |
# mkdir -p ~/.ssh
# # ensure private key
# echo "$DEPLOY_RSA" >> ~/.ssh/usher_rsa
# chmod 600 ~/.ssh/usher_rsa
# ssh -i ~/.ssh/usher_rsa -o StrictHostKeyChecking=no $DEPLOY_USERNAME@$DEPLOY_HOST "rm -rf urbit/hostyv/realm/*"
# scp -v -i ~/.ssh/usher_rsa -o StrictHostKeyChecking=no -r ./desks/realm/* $DEPLOY_USERNAME@$DEPLOY_HOST:./urbit/hostyv/realm
# ssh -v -i ~/.ssh/usher_rsa -o StrictHostKeyChecking=no $DEPLOY_USERNAME@$DEPLOY_HOST "rm -rf urbit/hostyv/usher/*"
# scp -i ~/.ssh/usher_rsa -o StrictHostKeyChecking=no -r ./desks/usher/* $DEPLOY_USERNAME@$DEPLOY_HOST:./urbit/hostyv/usher
# env:
# DEPLOY_USERNAME: ${{ secrets.DEPLOY_USERNAME }}
# DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
# DEPLOY_RSA: ${{ secrets.DEPLOY_RSA }}
# #
# # poke remote endpoint in usher agent which will run clay commit
# # see dirk: https://developers.urbit.org/reference/arvo/clay/examples#dirk
# # for more information
# - name: Deploy ship updates
# uses: actions/github-script@v6
# env:
# DEPLOY_SHIP: ${{ secrets.DEPLOY_SHIP }}
# DEPLOY_SHIP_CODE: ${{ secrets.DEPLOY_SHIP_CODE }}
# DEPLOY_ROOT_URL: ${{ secrets.DEPLOY_ROOT_URL }}
# with:
# script: |
# const script = require('./.github/workflows/scripts/deploy.js')
# console.log(script({github}, {
# ship: process.env.DEPLOY_SHIP,
# code: process.env.DEPLOY_SHIP_CODE,
# rootUrl: process.env.DEPLOY_ROOT_URL,
# mounts: ['usher', 'realm']
# }))
# # Workaround to avoid "Post Run actions/setup-node" failures.
# # See: https://codesti.com/issue/actions/setup-node/317
# - run: mkdir -p /home/runner/.npm
# continue-on-error: true
#
# once everything is done, flip the switch on the draft release to make
# the release available to auto-update
post-deploy:
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'build')
needs: [pre-deploy, build-mac, build-windows, build-linux, deploy-desks]
needs: [pre-deploy, build-mac, build-windows, build-linux] # deploy-desks]
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
4 changes: 3 additions & 1 deletion .github/workflows/scripts/pre-deploy.js
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ module.exports = async ({ github, context }, args) => {
// if you want to have the build script remove a release, set the release version/tag here
// removeRelease: undefined,
};
console.log(context);
// disable this workflow to prevent multiple builds running simultaneously
// console.log(
// `disabling workflow ${workflowId} to prevent multiple simultaneous builds...`
@@ -161,7 +162,8 @@ module.exports = async ({ github, context }, args) => {
if (context.eventName === 'pull_request' && context.ref === 'draft') {
ci.channel = 'draft';
} else if (
(context.eventName === 'pull_request' && context.ref === 'master') ||
(context.eventName === 'pull_request' &&
context.ref === 'refs/heads/master') ||
(context.eventName === 'push' && context.ref.endsWith('/staging'))
) {
ci.channel = 'alpha';
8 changes: 8 additions & 0 deletions .github/workflows/staging-build.yml
Original file line number Diff line number Diff line change
@@ -259,6 +259,7 @@ jobs:
BUILD_VERSION=$BUILD_VERSION
ARTIFACT_VERSION=$ARTIFACT_VERSION
RELEASE_CHANNEL=$RELEASE_CHANNEL
ROOMS_PROVIDER=node-test.holium.live
EOF
cd ../
sudo yarn package:prerelease:win
@@ -300,6 +301,13 @@ jobs:
with:
node-version: '>=18'
cache: 'npm'
# .
- name: Pull latest desks master
run: |
cd ./desks
git checkout master
git pull
cd ..
#
- name: Bump desks version
uses: actions/github-script@v6
7 changes: 4 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "urbit"]
path = urbit
url = https://github.com/urbit/urbit
[submodule "desks"]
path = desks
url = https://github.com/holium/desks
branch = master
28 changes: 16 additions & 12 deletions app/.holium/configs/webpack.config.renderer.dev.ts
Original file line number Diff line number Diff line change
@@ -57,7 +57,8 @@ const configuration: webpack.Configuration = {
mouse: {
import: path.join(webpackPaths.srcRendererPath, 'mouse.tsx'),
},
reactRefreshSetup: '@pmmmwh/react-refresh-webpack-plugin/client/ReactRefreshEntry.js',
reactRefreshSetup:
'@pmmmwh/react-refresh-webpack-plugin/client/ReactRefreshEntry.js',
updater: {
import: path.join(
webpackPaths.srcRendererPath,
@@ -139,7 +140,10 @@ const configuration: webpack.Configuration = {
NODE_ENV: 'development',
PLAYGROUND_PORT: playgroundPort,
USE_LOCAL_WALLET_API: useLocalWalletAPI,
API_URL: 'https://backend-server-test.thirdearth.com',
// patrick. changing the url here based on feedback from Johnathon.
// this url should work now, but the old one is being decommissioned in Nov.
// so updating to the new one now to get it completed
API_URL: 'https://backend-server-test.plymouth.network',
JOIN_API_URL: 'http://localhost:3000',
API_HEADERS_CLIENT_ID: '5',
API_HEADERS_VERSION: '2',
@@ -203,17 +207,17 @@ const configuration: webpack.Configuration = {
__dirname: true,
__filename: false,
},
optimization: {
runtimeChunk: 'single',
// Ensure `react-refresh/runtime` is hoisted and shared
// Could be replicated via a vendors chunk
splitChunks: {
chunks: 'all',
name(_, __, cacheGroupKey) {
return cacheGroupKey;
},
optimization: {
runtimeChunk: 'single',
// Ensure `react-refresh/runtime` is hoisted and shared
// Could be replicated via a vendors chunk
splitChunks: {
chunks: 'all',
name(_, __, cacheGroupKey) {
return cacheGroupKey;
},
},
},
},
devServer: {
port,
compress: true,
9 changes: 7 additions & 2 deletions app/.holium/configs/webpack.config.renderer.prod.ts
Original file line number Diff line number Diff line change
@@ -104,12 +104,17 @@ const configuration: webpack.Configuration = {
process.env.RELEASE_CHANNEL === 'hotfix'
? '~hostyv:realm'
: '~nimwyd-ramwyl-dozzod-hostyv:realm',
ROOMS_PROVIDER:
process.env.RELEASE_CHANNEL === 'latest' ||
process.env.RELEASE_CHANNEL === 'hotfix'
? 'litzod-dozzod-hostyv.holium.live'
: 'node-test.holium.live',
DEBUG_PROD: false,
SENTRY_DSN:
'https://56fbf5e600db48cf8a785931be1ca5e4@o1327359.ingest.sentry.io/4504310987358208',
AMPLITUDE_API_KEY: 'd6d123a2a660806abcc6b1845c475f2f',
AMPLITUDE_API_KEY_DEV: '68e00eca14dda372e15a8aadaa0b37ac',
API_URL: 'https://backend-server.third.earth',
API_URL: 'https://backend-server.holium.network',
JOIN_API_URL: 'https://join.holium.com',
API_HEADERS_CLIENT_ID: '5',
API_HEADERS_VERSION: '2',
@@ -128,7 +133,7 @@ const configuration: webpack.Configuration = {
// safe: false, // load '.env.example' to verify the '.env' variables are all set. Can also be a string to a different file.
// allowEmptyValues: false, // allow empty variables (e.g. `FOO=`) (treat it as empty string, rather than missing)
// systemvars: false, // load all the predefined 'process.env' variables which will trump anything local per dotenv specs.
silent: true, // hide any errors
silent: false, // hide any errors
// defaults: false, // load '.env.defaults' as the default values if empty.
}),
new MiniCssExtractPlugin({
6 changes: 3 additions & 3 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
},
"dependencies": {
"@amplitude/analytics-browser": "^1.9.1",
"@aws-sdk/client-s3": "^3.388.0",
"@cliqz/adblocker-electron": "^1.23.8",
"@radix-ui/react-popover": "^1.0.0",
"@sentry/integrations": "^7.48.0",
@@ -36,7 +37,6 @@
"@urbit/api": "^2.1.1",
"@urbit/aura": "^1.0.0",
"alchemy-sdk": "^2.2.1",
"aws-sdk": "^2.1204.0",
"axios": "^1.3.5",
"bcryptjs": "^2.4.3",
"better-sqlite3": "^8.2.0",
@@ -126,7 +126,7 @@
"detect-port": "^1.3.0",
"dotenv": "^16.0.3",
"dotenv-webpack": "^8.0.1",
"electron": "^23.0.0",
"electron": "^23.3.13",
"electron-builder": "^23.3.3",
"electron-notarize": "^1.2.1",
"electronmon": "^2.0.2",
@@ -253,4 +253,4 @@
"url": "https://github.com/holium/realm/issues"
},
"homepage": "https://github.com/holium/realm#readme"
}
}
2 changes: 1 addition & 1 deletion app/src/main/helpers/dev.ts
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ const registerListeners = (mainWindow: BrowserWindow) => {
// Preserve fullscreen state.
const isFullScreen = mainWindow.isFullScreen();
if (isFullScreen) {
fullScreenWindow(mainWindow);
fullScreenWindow(mainWindow, null);
}
});
};
Loading