Skip to content

Commit

Permalink
Merge pull request #1869 from OpenC3/dependencies
Browse files Browse the repository at this point in the history
Update import-map-overrides and vuetify-labs
  • Loading branch information
jmthomas authored Jan 30, 2025
2 parents c922d8d + f75ab2a commit db591b6
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 27 deletions.
3 changes: 3 additions & 0 deletions openc3-cosmos-cmd-tlm-api/Procfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
web: bin/rails s -b 0.0.0.0 -p 2901
# Go logging is log_level (https://docs.anycable.io/anycable-go/configuration?id=logging-settings)
ws: anycable-go --host 0.0.0.0 --port 3901 --path /openc3-api/cable --log_level error
# Ruby logging is log-level (https://docs.anycable.io/ruby/logging?id=logging)
# but Rails overrides this so we set it in config/application.rb
rpc: bundle exec anycable --broadcast_adapter http
9 changes: 8 additions & 1 deletion openc3-cosmos-cmd-tlm-api/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,16 @@ class Application < Rails::Application
)
end

puts "Starting #{$0} in #{Rails.env} environment"

# Setup structured logging
require 'openc3/utilities/cosmos_rails_formatter'
config.log_level = ENV["LOG_LEVEL"] || :info
# Don't set the anycable logger to info because it's way too much output
if $0.include?('anycable')
config.log_level = ENV["LOG_LEVEL"] || :error
else
config.log_level = ENV["LOG_LEVEL"] || :info
end
config.log_tags = {
request_id: :request_id,
token: -> request { request.headers['HTTP_AUTHORIZATION'] || request.query_parameters[:authorization] }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# if purchased from OpenC3, Inc.
*/

import { createConsumer } from "@anycable/web";
import { createConsumer } from '@anycable/web'

export default class Cable {
constructor(url = '/openc3-api/cable') {
Expand All @@ -29,7 +29,8 @@ export default class Cable {
}
disconnect() {
if (this._cable) {
this._cable.disconnect()
this._cable.cable.disconnect()
this._cable = null
}
}
createSubscription(channel, scope, callbacks = {}, additionalOptions = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"date-fns": "4.1.0",
"import-map-overrides": "5.1.0",
"systemjs": "6.15.1",
"vuetify": "3.7.8"
"vuetify": "3.7.6"
},
"devDependencies": {
"@babel/plugin-transform-modules-systemjs": "7.25.9",
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<link rel="stylesheet" href="/css/roboto.css" />
<link rel="stylesheet" href="/css/materialdesignicons-7.4.47.min.css" />
<link rel="stylesheet" href="/css/vuetify-labs-3.7.5.min.css" />
<link rel="stylesheet" href="/css/vuetify-labs-3.7.6.min.css" />
<link rel="stylesheet" href="/css/astro-web-components-7.24.0.css" />

<!-- https://realfavicongenerator.net/ generated favicons -->
Expand Down Expand Up @@ -47,7 +47,7 @@
"imports": {
"single-spa": "/js/single-spa-6.0.3.min.js",
"vue": "/js/vue.global.prod-3.5.13.min.js",
"vuetify": "/js/vuetify-labs-3.7.5.min.js",
"vuetify": "/js/vuetify-labs-3.7.6.min.js",
"vue-router": "/js/vue-router-4.4.4.min.js",
"vuex": "/js/vuex-4.1.0.min.js"
}
Expand All @@ -57,12 +57,12 @@
<!-- See note above for how to update these -->
<link rel="preload" href="/js/single-spa-6.0.3.min.js" as="script" />
<link rel="preload" href="/js/vue.global.prod-3.5.13.min.js" as="script" />
<link rel="preload" href="/js/vuetify-labs-3.7.5.min.js" as="script" />
<link rel="preload" href="/js/vuetify-labs-3.7.6.min.js" as="script" />
<link rel="preload" href="/js/vue-router-4.4.4.min.js" as="script" />
<link rel="preload" href="/js/vuex-4.1.0.min.js" as="script" />
<script src="/js/browsercheck.js"></script>
<script src="/js/auth.js"></script>
<script src="/js/import-map-overrides-4.2.0.min.js"></script>
<script src="/js/import-map-overrides-5.1.0.min.js"></script>
<!-- systemjs homepage: https://github.com/systemjs/systemjs/releases
We use system.js instead of s.js which includes global and module-types.
We also explicitly use amd (asynchronous module definition) which uses named-register
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<link rel="stylesheet" href="/css/roboto.css" />
<link rel="stylesheet" href="/css/materialdesignicons-7.4.47.min.css" />
<link rel="stylesheet" href="/css/vuetify-labs-3.7.5.min.css" />
<link rel="stylesheet" href="/css/vuetify-labs-3.7.6.min.css" />
<link rel="stylesheet" href="/css/astro-web-components-7.24.0.css" />

<!-- https://realfavicongenerator.net/ generated favicons -->
Expand Down Expand Up @@ -47,7 +47,7 @@
"imports": {
"single-spa": "/js/single-spa-6.0.3.min.js",
"vue": "/js/vue.global.prod-3.5.13.min.js",
"vuetify": "/js/vuetify-labs-3.7.5.min.js",
"vuetify": "/js/vuetify-labs-3.7.6.min.js",
"vue-router": "/js/vue-router-4.4.4.min.js",
"vuex": "/js/vuex-4.1.0.min.js"
}
Expand All @@ -57,12 +57,12 @@
<!-- See note above for how to update these -->
<link rel="preload" href="/js/single-spa-6.0.3.min.js" as="script" />
<link rel="preload" href="/js/vue.global.prod-3.5.13.min.js" as="script" />
<link rel="preload" href="/js/vuetify-labs-3.7.5.min.js" as="script" />
<link rel="preload" href="/js/vuetify-labs-3.7.6.min.js" as="script" />
<link rel="preload" href="/js/vue-router-4.4.4.min.js" as="script" />
<link rel="preload" href="/js/vuex-4.1.0.min.js" as="script" />
<script src="/js/browsercheck.js"></script>
<script src="/js/auth.js"></script>
<script src="/js/import-map-overrides-4.2.0.min.js"></script>
<script src="/js/import-map-overrides-5.1.0.min.js"></script>
<!-- systemjs homepage: https://github.com/systemjs/systemjs/releases
We use system.js instead of s.js which includes global and module-types.
We also explicitly use amd (asynchronous module definition) which uses named-register
Expand Down

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"sprintf-js": "1.1.3",
"uplot": "1.6.31",
"vue": "3.5.13",
"vuetify": "3.7.8",
"vuetify": "3.7.6",
"vuex": "4.1.0"
},
"devDependencies": {
Expand Down
5 changes: 4 additions & 1 deletion openc3-cosmos-script-runner-api/Procfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
web: bin/rails s -b 0.0.0.0 -p 2902
ws: anycable-go --host 0.0.0.0 --port 3902 --path /script-api/cable --log_level error
# Go logging is log_level (https://docs.anycable.io/anycable-go/configuration?id=logging-settings)
ws: anycable-go --host 0.0.0.0 --port 3902 --path /script-api/cable
# Ruby logging is log-level (https://docs.anycable.io/ruby/logging?id=logging)
# but Rails overrides this so we set it in config/application.rb
rpc: bundle exec anycable --broadcast_adapter http
9 changes: 8 additions & 1 deletion openc3-cosmos-script-runner-api/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,16 @@ class Application < Rails::Application
)
end

puts "Starting #{$0} in #{Rails.env} environment"

# Setup structured logging
require 'openc3/utilities/cosmos_rails_formatter'
config.log_level = ENV["LOG_LEVEL"] || :info
# Don't set the anycable logger to info because it's way too much output
if $0.include?('anycable')
config.log_level = ENV["LOG_LEVEL"] || :error
else
config.log_level = ENV["LOG_LEVEL"] || :info
end
config.log_tags = {
request_id: :request_id,
token: -> request { request.headers['HTTP_AUTHORIZATION'] || request.query_parameters[:authorization] }
Expand Down

0 comments on commit db591b6

Please sign in to comment.