openc3 6.8.0 → 6.9.0

data/lib/openc3/topics/limits_event_topic.rb

@@ -47,7 +47,7 @@ module OpenC3
         field = "#{event[:target_name]}__#{event[:packet_name]}__#{event[:item_name]}"
         limits_settings = Store.hget("#{scope}__current_limits_settings", field)
         if limits_settings
-          limits_settings = JSON.parse(limits_settings, :allow_nan => true, :create_additions => true)
+          limits_settings = JSON.parse(limits_settings, allow_nan: true, create_additions: true)
         else
           limits_settings = {}
         end
@@ -61,18 +61,18 @@ module OpenC3
         limits_settings[event[:limits_set]] = limits
         limits_settings['persistence_setting'] = event[:persistence] if event[:persistence]
         limits_settings['enabled'] = event[:enabled] if not event[:enabled].nil?
-        Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, :allow_nan => true))
+        Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, allow_nan: true))
 
       when :LIMITS_ENABLE_STATE
         field = "#{event[:target_name]}__#{event[:packet_name]}__#{event[:item_name]}"
         limits_settings = Store.hget("#{scope}__current_limits_settings", field)
         if limits_settings
-          limits_settings = JSON.parse(limits_settings, :allow_nan => true, :create_additions => true)
+          limits_settings = JSON.parse(limits_settings, allow_nan: true, create_additions: true)
         else
           limits_settings = {}
         end
         limits_settings['enabled'] = event[:enabled]
-        Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, :allow_nan => true))
+        Store.hset("#{scope}__current_limits_settings", field, JSON.generate(limits_settings, allow_nan: true))
 
       when :LIMITS_SET
         sets = sets(scope: scope)
@@ -86,7 +86,7 @@ module OpenC3
         raise "Invalid limits event type '#{event[:type]}'"
       end
 
-      Topic.write_topic("#{scope}__openc3_limits_events", {event: JSON.generate(event, :allow_nan => true)}, '*', 1000)
+      Topic.write_topic("#{scope}__openc3_limits_events", {event: JSON.generate(event, allow_nan: true)}, '*', 1000)
     end
 
     # Remove the JSON encoding to return hashes directly
@@ -106,7 +106,7 @@ module OpenC3
       end
       parsed_result = []
       final_result.each do |offset, hash|
-        parsed_result << [offset, JSON.parse(hash['event'], :allow_nan => true, :create_additions => true)]
+        parsed_result << [offset, JSON.parse(hash['event'], allow_nan: true, create_additions: true)]
       end
       return parsed_result
     end
@@ -175,7 +175,7 @@ module OpenC3
         if target
           packet = target[packet_name]
           if packet
-            limits_settings = JSON.parse(limits_settings, :allow_nan => true, :create_additions => true)
+            limits_settings = JSON.parse(limits_settings, allow_nan: true, create_additions: true)
             enabled = limits_settings['enabled']
             persistence = limits_settings['persistence_setting']
             limits_settings.each do |limits_set, settings|
@@ -199,7 +199,7 @@ module OpenC3
       telemetry = System.telemetry.all
       topics = ["#{scope}__openc3_limits_events"]
       Topic.read_topics(topics, nil, block_ms) do |_topic, _msg_id, event, _redis|
-        event = JSON.parse(event['event'], :allow_nan => true, :create_additions => true)
+        event = JSON.parse(event['event'], allow_nan: true, create_additions: true)
         case event['type']
         when 'LIMITS_CHANGE'
           # Ignore

data/lib/openc3/topics/router_topic.rb

@@ -24,6 +24,8 @@ require 'openc3/topics/topic'
 
 module OpenC3
   class RouterTopic < Topic
+    COMMAND_ACK_TIMEOUT_S = 30
+
     # Generate a list of topics for this router. This includes the router itself
     # and all the targets which are assigned to this router.
     def self.topics(router, scope:)
@@ -41,11 +43,11 @@ module OpenC3
       while true
         Topic.read_topics(RouterTopic.topics(router, scope: scope)) do |topic, msg_id, msg_hash, redis|
           result = yield topic, msg_id, msg_hash, redis
-          if /CMD}ROUTER/.match?(topic)
+          if result and /CMD}ROUTER/.match?(topic)
             ack_topic = topic.split("__")
             ack_topic[1] = 'ACK' + ack_topic[1]
             ack_topic = ack_topic.join("__")
-            Topic.write_topic(ack_topic, { 'result' => result }, msg_id, 100)
+            Topic.write_topic(ack_topic, { 'result' => result, 'id' => msg_id }, msg_id, 100)
           end
         end
       end
@@ -65,7 +67,7 @@ module OpenC3
 
     def self.connect_router(router_name, *router_params, scope:)
       if router_params && !router_params.empty?
-        Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'connect' => 'true', 'params' => JSON.generate(router_params) }, '*', 100)
+        Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'connect' => 'true', 'params' => JSON.generate(router_params, allow_nan: true) }, '*', 100)
       else
         Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'connect' => 'true' }, '*', 100)
       end
@@ -102,5 +104,42 @@ module OpenC3
       data['index'] = index
       Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'protocol_cmd' => JSON.generate(data, allow_nan: true) }, '*', 100)
     end
+
+    def self.router_target_enable(router_name, target_name, cmd_only: false, tlm_only: false, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['cmd_only'] = cmd_only
+      data['tlm_only'] = tlm_only
+      data['action'] = 'enable'
+      Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'target_control' => JSON.generate(data, allow_nan: true) }, '*', 100)
+    end
+
+    def self.router_target_disable(router_name, target_name, cmd_only: false, tlm_only: false, scope:)
+      data = {}
+      data['target_name'] = target_name.to_s.upcase
+      data['cmd_only'] = cmd_only
+      data['tlm_only'] = tlm_only
+      data['action'] = 'disable'
+      Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'target_control' => JSON.generate(data, allow_nan: true) }, '*', 100)
+    end
+
+    def self.router_details(router_name, timeout: nil, scope:)
+      router_name = router_name.upcase
+
+      timeout = COMMAND_ACK_TIMEOUT_S unless timeout
+      ack_topic = "{#{scope}__ACKCMD}ROUTER__#{router_name}"
+      Topic.update_topic_offsets([ack_topic])
+
+      cmd_id = Topic.write_topic("{#{scope}__CMD}ROUTER__#{router_name}", { 'router_details' => 'true' }, '*', 100)
+      time = Time.now
+      while (Time.now - time) < timeout
+        Topic.read_topics([ack_topic]) do |_topic, _msg_id, msg_hash, _redis|
+          if msg_hash["id"] == cmd_id
+            return JSON.parse(msg_hash["result"], :allow_nan => true, :create_additions => true)
+          end
+        end
+      end
+      raise "Timeout of #{timeout}s waiting for cmd ack"
+    end
   end
 end

data/lib/openc3/topics/system_events_topic.rb

@@ -28,7 +28,7 @@ module OpenC3
 
     def self.write(type, event)
       event['type'] = type
-      Topic.write_topic(PRIMARY_KEY, {event: JSON.generate(event)}, '*', 1000)
+      Topic.write_topic(PRIMARY_KEY, {event: JSON.generate(event, allow_nan: true)}, '*', 1000)
     end
 
     def self.read()

data/lib/openc3/topics/telemetry_decom_topic.rb

@@ -42,7 +42,7 @@ module OpenC3
           :target_name => packet.target_name,
           :packet_name => packet.packet_name,
           :received_count => packet.received_count,
-          :json_data => JSON.generate(json_hash.as_json(:allow_nan => true)),
+          :json_data => JSON.generate(json_hash.as_json, allow_nan: true),
         }
         Topic.write_topic("#{scope}__DECOM__{#{packet.target_name}}__#{packet.packet_name}", msg_hash, id)
 

data/lib/openc3/utilities/authentication.rb

@@ -161,7 +161,7 @@ module OpenC3
       @log[1] = "response status: #{resp.status} header: #{resp.headers} body: #{resp.body}"
       STDOUT.puts @log[1] if JsonDRb.debug?
       if resp.status >= 200 && resp.status <= 299
-        return JSON.parse(resp.body, :allow_nan => true, :create_additions => true)
+        return JSON.parse(resp.body, allow_nan: true, create_additions: true)
       elsif resp.status >= 500 && resp.status <= 599
         raise OpenC3AuthenticationRetryableError, "authentication request retryable #{@log[0]} ::: #{@log[1]}"
       else

data/lib/openc3/utilities/cosmos_rails_formatter.rb

@@ -50,11 +50,10 @@ module OpenC3
           other[:exception_backtrace] = payload[:exception_object].backtrace.as_json
         end
       end
-      # This happens for a separate exception log entry which we want to not include the backtrace a second time
       if log.exception
-        message = "Exception was raised - #{log.exception.class}:#{log.exception.message}" unless message
+        message = "Exception was raised - #{log.exception.class}:#{log.exception.message}:#{log.exception.backtrace.join(":")}" unless message
       end
-      return OpenC3::Logger.build_log_data(log.level.to_s.upcase, message, user: username, type: OpenC3::Logger::LOG, url: nil, other: other).as_json(:allow_nan => true).to_json(:allow_nan => true)
+      return OpenC3::Logger.build_log_data(log.level.to_s.upcase, message, user: username, type: OpenC3::Logger::LOG, url: nil, other: other).as_json().to_json(allow_nan: true)
     end
   end
 end

data/lib/openc3/utilities/local_mode.rb

@@ -170,7 +170,7 @@ module OpenC3
             if gem_name == local_gem_name
               # Gems match - Do the names match?
               data = File.read(plugin_instance)
-              json = JSON.parse(data, :allow_nan => true, :create_additions => true)
+              json = JSON.parse(data, allow_nan: true, create_additions: true)
 
               found = false
               found_models.each do |name, _model_details|
@@ -221,7 +221,7 @@ module OpenC3
         if plugin_file_path =~ Regexp.new("^#{OPENC3_LOCAL_MODE_PATH}/#{scope}/")
           # From local init - Always just update the exact one
           File.open(File.join(File.dirname(plugin_file_path), 'plugin_instance.json'), 'wb') do |file|
-            file.write(JSON.pretty_generate(plugin_hash, :allow_nan => true))
+            file.write(JSON.pretty_generate(plugin_hash, allow_nan: true))
           end
         else
           # From online install / update
@@ -247,7 +247,7 @@ module OpenC3
                   if old_plugin_name
                     # And we're updating a plugin
                     data = File.read(plugin_instance)
-                    json = JSON.parse(data, :allow_nan => true, :create_additions => true)
+                    json = JSON.parse(data, allow_nan: true, create_additions: true)
                     if json["name"] == old_plugin_name
                       # Found plugin to update
                       found = true
@@ -301,7 +301,7 @@ module OpenC3
           file.write(data)
         end
         File.open(File.join(full_folder_path, 'plugin_instance.json'), 'wb') do |file|
-          file.write(JSON.pretty_generate(plugin_hash, :allow_nan => true))
+          file.write(JSON.pretty_generate(plugin_hash, allow_nan: true))
         end
       ensure
         FileUtils.remove_entry_secure(temp_dir, true)
@@ -317,7 +317,7 @@ module OpenC3
           plugin_instance = details[:plugin_instance]
           if gems.length == 1 and plugin_instance
             data = File.read(plugin_instance)
-            json = JSON.parse(data, :allow_nan => true, :create_additions => true)
+            json = JSON.parse(data, allow_nan: true, create_additions: true)
             instance_name = json['name']
             if plugin_name == instance_name
               puts "Removing local plugin files: #{full_folder_path}"
@@ -443,7 +443,7 @@ module OpenC3
           data = File.read(config)
           begin
             # Parse just to ensure we have valid JSON
-            JSON.parse(data, :allow_nan => true, :create_additions => true)
+            JSON.parse(data, allow_nan: true, create_additions: true)
             # Only save if the parse was successful
             ToolConfigModel.save_config(parts[-2], File.basename(config, '.json'), data, scope: scope, local_mode: false)
           rescue JSON::ParserError => e
@@ -454,12 +454,12 @@ module OpenC3
     end
 
     def self.save_tool_config(scope, tool, name, data)
-      json = JSON.parse(data, :allow_nan => true, :create_additions => true)
+      json = JSON.parse(data, allow_nan: true, create_additions: true)
       config_path = "#{OPENC3_LOCAL_MODE_PATH}/#{scope}/tool_config/#{tool}/#{name}.json"
       return unless File.expand_path(config_path).start_with?(OPENC3_LOCAL_MODE_PATH)
       FileUtils.mkdir_p(File.dirname(config_path))
       File.open(config_path, 'w') do |file|
-        file.write(JSON.pretty_generate(json, :allow_nan => true))
+        file.write(JSON.pretty_generate(json, allow_nan: true))
       end
     end
 

data/lib/openc3/utilities/logger.rb

@@ -204,14 +204,14 @@ module OpenC3
           case log_level
           when WARN_LEVEL, ERROR_LEVEL, FATAL_LEVEL
             if ENV['OPENC3_LOG_STDERR']
-              $stderr.puts data.as_json(:allow_nan => true).to_json(:allow_nan => true)
+              $stderr.puts data.as_json().to_json(allow_nan: true)
               $stderr.flush
             else
-              $stdout.puts data.as_json(:allow_nan => true).to_json(:allow_nan => true)
+              $stdout.puts data.as_json().to_json(allow_nan: true)
               $stdout.flush
             end
           else
-            $stdout.puts data.as_json(:allow_nan => true).to_json(:allow_nan => true)
+            $stdout.puts data.as_json().to_json(allow_nan: true)
             $stdout.flush
           end
         end

data/lib/openc3/utilities/running_script.rb

@@ -51,13 +51,13 @@ SCRIPT_API = 'script-api'
 
 def running_script_publish(channel_name, data)
   stream_name = [SCRIPT_API, channel_name].compact.join(":")
-  OpenC3::Store.publish(stream_name, JSON.generate(data))
+  OpenC3::Store.publish(stream_name, JSON.generate(data, allow_nan: true))
 end
 
 def running_script_anycable_publish(channel_name, data)
   stream_name = [SCRIPT_API, channel_name].compact.join(":")
-  stream_data = {"stream" => stream_name, "data" => JSON.generate(data)}
-  OpenC3::Store.publish("__anycable__", JSON.generate(stream_data))
+  stream_data = {"stream" => stream_name, "data" => JSON.generate(data, allow_nan: true)}
+  OpenC3::Store.publish("__anycable__", JSON.generate(stream_data, allow_nan: true))
 end
 
 module OpenC3
@@ -458,8 +458,8 @@ class RunningScript
       start_time: start_time, # Time the script started ISO format
       end_time: nil, # Time the script ended ISO format
       disconnect: disconnect, # Disconnect is set to true if the script is running in a disconnected mode
-      environment: status_environment.as_json(:allow_nan => true).to_json(:allow_nan => true), # nil or Hash of key/value pairs for environment variables
-      suite_runner: suite_runner ? suite_runner.as_json(:allow_nan => true).to_json(:allow_nan => true) : nil,
+      environment: status_environment.as_json().to_json(allow_nan: true), # nil or Hash of key/value pairs for environment variables
+      suite_runner: suite_runner ? suite_runner.as_json().to_json(allow_nan: true) : nil,
       errors: nil, # array of errors that occurred during the script run
       pid: nil, # pid of the script process - set by the script itself when it starts
       script_engine: script_engine, # script engine filename
@@ -770,7 +770,7 @@ class RunningScript
 
   def run
     if @script_status.suite_runner
-      @script_status.suite_runner = JSON.parse(@script_status.suite_runner, :allow_nan => true, :create_additions => true) # Convert to hash
+      @script_status.suite_runner = JSON.parse(@script_status.suite_runner, allow_nan: true, create_additions: true) # Convert to hash
       if @script_status.suite_runner['options']
         parse_options(@script_status.suite_runner['options'])
       else
@@ -1050,7 +1050,7 @@ class RunningScript
       line_count = 0
       string.each_line(chomp: true) do |out_line|
         begin
-          json = JSON.parse(out_line, :allow_nan => true, :create_additions => true)
+          json = JSON.parse(out_line, allow_nan: true, create_additions: true)
           time_formatted = Time.parse(json["@timestamp"]).sys.formatted if json["@timestamp"]
           if json["log"]
             out_line = json["log"]
@@ -1082,7 +1082,7 @@ class RunningScript
       else
         published_lines = lines_to_write
       end
-      running_script_anycable_publish("running-script-channel:#{@script_status.id}", { type: :output, line: published_lines.as_json(:allow_nan => true), color: color })
+      running_script_anycable_publish("running-script-channel:#{@script_status.id}", { type: :output, line: published_lines.as_json(), color: color })
       # Add to the message log
       message_log.write(lines_to_write)
     end

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '6.8.0'
+OPENC3_VERSION = '6.9.0'
 module OpenC3
   module Version
     MAJOR = '6'
-    MINOR = '8'
+    MINOR = '9'
     PATCH = '0'
     OTHER = ''
-    BUILD = '35fc05d093679cc901fc15e31a9af4b71fad61b4'
+    BUILD = '92d65ed951bb86b6b155f7e7b7327e889f58e314'
   end
-  VERSION = '6.8.0'
-  GEM_VERSION = '6.8.0'
+  VERSION = '6.9.0'
+  GEM_VERSION = '6.9.0'
 end

data/templates/plugin/README.md

@@ -15,9 +15,9 @@ Update this comment with your own description.
    - VERSION is required
    - gem file will be built locally
 
-## Building tool / widget plugins using a local Ruby/Node/Yarn/Rake Environment
+## Building tool / widget plugins using a local Ruby/Node/pnpm/Rake Environment
 
-1. yarn
+1. pnpm install --frozen-lockfile --ignore-scripts
 1. rake build VERSION=1.0.0
 
 ## Building tool / widget plugins using Docker and the openc3-node container
@@ -36,7 +36,7 @@ Windows:
 docker run -it -v %cd%:/openc3/local -w /openc3/local docker.io/openc3inc/openc3-node sh
 ```
 
-1. yarn
+1. pnpm install --frozen-lockfile --ignore-scripts
 1. rake build VERSION=1.0.0
 
 ## Installing into OpenC3 COSMOS

data/templates/plugin/Rakefile

@@ -15,10 +15,10 @@ task :build => [:require_version] do
     puts "Warning: Building gem on Windows will lose file permissions"
   end
 
-  # Run yarn build if we have a package.json
+  # Run pnpm build if we have a package.json
   if File.exist?('package.json')
-    sh('yarn run build') do |ok, status|
-      raise "yarn run build failed" if !ok
+    sh('pnpm run build') do |ok, status|
+      raise "pnpm run build failed" if !ok
     end
   end
 

data/templates/plugin/plugin.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.email = ['name@domain.com']
   s.homepage = 'https://github.com/OpenC3/cosmos'
   s.platform = Gem::Platform::RUBY
+  s.required_ruby_version = '>= 3.0'
 
   if ENV['VERSION']
     s.version = ENV['VERSION'].dup

data/templates/tool_angular/.gitignore

@@ -9,7 +9,7 @@
 # Node
 /node_modules
 npm-debug.log
-yarn-error.log
+pnpm-debug.log*
 
 # IDEs and editors
 .idea/

data/templates/tool_angular/package.json

@@ -1,48 +1,2 @@
-{
-  "name": "<%= tool_name %>",
-  "version": "6.8.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test",
-    "build:single-spa:openc3-tool-template-angular": "ng build openc3-tool-<%= tool_name %> --configuration production",
-    "serve:single-spa:openc3-tool-template-angular": "ng s --project openc3-tool-<%= tool_name %> --disable-host-check --port 4200 --live-reload false"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^18.2.6",
-    "@angular/cdk": "^18.2.6",
-    "@angular/common": "^18.2.6",
-    "@angular/compiler": "^18.2.6",
-    "@angular/core": "^18.2.6",
-    "@angular/forms": "^18.2.6",
-    "@angular/material": "^18.2.10",
-    "@angular/platform-browser": "^18.2.6",
-    "@angular/platform-browser-dynamic": "^18.2.6",
-    "@angular/router": "^18.2.6",
-    "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.8.0",
-    "rxjs": "~7.8.0",
-    "single-spa": "^5.9.5",
-    "single-spa-angular": "^9.2.0",
-    "tslib": "^2.7.0",
-    "zone.js": "^0.13.0"
-  },
-  "devDependencies": {
-    "@angular-builders/custom-webpack": "^18.0.0",
-    "@angular-devkit/build-angular": "^18.2.6",
-    "@angular/cli": "~18.2.6",
-    "@angular/compiler-cli": "^18.2.6",
-    "@types/jasmine": "~5.1.4",
-    "jasmine-core": "~5.4.0",
-    "karma": "~6.4.4",
-    "karma-chrome-launcher": "~3.2.0",
-    "karma-coverage": "~2.2.0",
-    "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~2.1.0",
-    "style-loader": "^4.0.0",
-    "typescript": "~5.5.4"
-  }
-}
+  "version": "6.9.0",
+    "@openc3/js-common": "6.9.0",

data/templates/tool_react/.gitignore

@@ -2,8 +2,7 @@
 logs
 *.log
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+pnpm-debug.log*
 
 # Runtime data
 pids

data/templates/tool_react/package.json

@@ -1,51 +1 @@
-{
-  "scripts": {
-    "start": "webpack serve",
-    "start:standalone": "webpack serve --env standalone",
-    "build": "concurrently yarn:build:*",
-    "build:webpack": "webpack --mode=production",
-    "analyze": "webpack --mode=production --env analyze",
-    "lint": "eslint src --ext js",
-    "format": "prettier --write .",
-    "check-format": "prettier --check .",
-    "test": "cross-env BABEL_ENV=test jest",
-    "watch-tests": "cross-env BABEL_ENV=test jest --watch",
-    "coverage": "cross-env BABEL_ENV=test jest --coverage"
-  },
-  "dependencies": {
-    "@emotion/react": "^11.13.3",
-    "@emotion/styled": "^11.11.0",
-    "@mui/material": "^6.1.1",
-    "@openc3/js-common": "6.8.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "single-spa-react": "^5.1.4"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/eslint-parser": "^7.25.1",
-    "@babel/plugin-transform-runtime": "^7.25.4",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.23.3",
-    "@babel/runtime": "^7.25.6",
-    "@testing-library/jest-dom": "^6.5.0",
-    "@testing-library/react": "^16.0.1",
-    "babel-jest": "^29.7.0",
-    "concurrently": "^9.0.1",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-react-important-stuff": "^3.0.0",
-    "eslint-plugin-prettier": "^5.1.2",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.7.0",
-    "jest-cli": "^29.7.0",
-    "prettier": "^3.1.1",
-    "pretty-quick": "^4.0.0",
-    "webpack": "^5.95.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-config-single-spa-react": "^4.0.5",
-    "webpack-dev-server": "^5.1.0",
-    "webpack-merge": "^6.0.1"
-  }
-}
+    "@openc3/js-common": "6.9.0",

data/templates/tool_svelte/.gitignore

@@ -2,8 +2,7 @@
 logs
 *.log
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+pnpm-debug.log*
 
 # Runtime data
 pids

data/templates/tool_svelte/package.json

@@ -1,49 +1 @@
-{
-  "scripts": {
-    "build": "concurrently yarn:build:*",
-    "build:rollup": "rollup -c --bundleConfigAsCjs",
-    "start": "rollup -c -w",
-    "serve": "sirv dist -c",
-    "test": "jest",
-    "format": "prettier --write --plugin-search-dir=. .",
-    "check-format": "prettier --plugin-search-dir=. --check .",
-    "prepare": "yarn run smui-theme",
-    "smui-theme": "smui-theme compile build/smui.css -i src/theme"
-  },
-  "dependencies": {
-    "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.8.0",
-    "@smui/button": "^7.0.0",
-    "@smui/common": "^7.0.0",
-    "@smui/card": "^7.0.0",
-    "@smui/list": "^7.0.0",
-    "@smui/menu": "^7.0.0",
-    "axios": "^1.7.7",
-    "single-spa-svelte": "^2.1.1",
-    "sirv-cli": "^2.0.2",
-    "svelte-portal": "^2.2.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.25.4",
-    "@rollup/plugin-commonjs": "^28.0.0",
-    "@rollup/plugin-node-resolve": "^15.3.0",
-    "@testing-library/jest-dom": "^6.5.0",
-    "@testing-library/svelte": "^5.2.1",
-    "babel-jest": "^29.7.0",
-    "concurrently": "^9.0.1",
-    "jest": "^29.7.0",
-    "postcss": "^8.4.47",
-    "prettier": "^3.1.1",
-    "prettier-plugin-svelte": "^3.2.7",
-    "rollup": "^4.22.4",
-    "rollup-plugin-livereload": "^2.0.5",
-    "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-svelte": "^7.1.6",
-    "rollup-plugin-terser": "^7.0.2",
-    "smui-theme": "^7.0.0",
-    "svelte": "^4.2.19",
-    "svelte-jester": "^5.0.0"
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
-}
+    "@openc3/js-common": "6.9.0",

data/templates/tool_vue/package.json

@@ -1,36 +1,3 @@
-{
-  "name": "<%= tool_name %>",
-  "version": "6.8.0",
-  "private": true,
-  "type": "module",
-  "scripts": {
-    "serve": "vite build --watch --mode dev-server",
-    "build": "vite build",
-    "lint": "eslint src",
-    "serve:standalone": "vite preview --mode standalone"
-  },
-  "dependencies": {
-    "@astrouxds/astro-web-components": "^7.24.0",
-    "@openc3/js-common": "6.8.0",
-    "@openc3/vue-common": "6.8.0",
-    "axios": "^1.7.7",
-    "date-fns": "^4.1.0",
-    "lodash": "^4.17.21",
-    "single-spa-vue": "^3.0.0",
-    "sprintf-js": "^1.1.3"
-  },
-  "devDependencies": {
-    "@vitejs/plugin-vue": "^5.1.5",
-    "@vue/eslint-config-prettier": "^9.0.0",
-    "@vue/test-utils": "^2.4.6",
-    "eslint": "^9.16.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-vue": "^9.30.0",
-    "prettier": "^3.3.3",
-    "sass": "^1.80.4",
-    "vite": "^5.4.11",
-    "vue": "^3.5.13",
-    "vue-eslint-parser": "^9.4.3"
-  }
-}
+  "version": "6.9.0",
+    "@openc3/js-common": "6.9.0",
+    "@openc3/vue-common": "6.9.0",

data/templates/widget/Rakefile

@@ -14,7 +14,7 @@ task :build => [:require_version] do
   end
   # Build the widget and gem using sh built into Rake:
   # https://rubydoc.info/gems/rake/FileUtils#sh-instance_method
-  sh('yarn', 'run', 'build')
+  sh('pnpm', 'run', 'build')
   sh('gem', 'build', PLUGIN_NAME)
   sh('openc3cli validate *.gem') do |ok, status|
     if !ok && status.exitstatus == 127 # command not found