Merge pull request #1910 from OpenC3/dependencies

Update dependencies
OpenC3 · Feb 22, 2025 · b0aaee5 · b0aaee5
2 parents 2adda68 + f193a8b
commit b0aaee5
Show file tree

Hide file tree

Showing 59 changed files with 410 additions and 337 deletions.
diff --git a/.env b/.env
@@ -48,7 +48,7 @@ OPENC3_SR_BUCKET_PASSWORD=scriptrunnerminiopassword
 OPENC3_SERVICE_PASSWORD=openc3service
 # Build and repository settings
 ALPINE_VERSION=3.19
-ALPINE_BUILD=6
+ALPINE_BUILD=7
 APK_URL=https://dl-cdn.alpinelinux.org
 RUBYGEMS_URL=https://rubygems.org
 PYPI_URL=https://pypi.org

diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ coverage/
 profile/
 plugins/DEFAULT/
 **/python/prof/
+*.dSYM/
 
 # local env files
 .env.local

diff --git a/INSTALL.md b/INSTALL.md
@@ -26,8 +26,8 @@ To build you can use an environment variable `SSL_CERT_FILE` or it will default
 
 If you're building and want to use a private Rubygems, NPM or APK server (e.g. Nexus) you can update the following environment variables: RUBYGEMS_URL, NPM_URL, APK_URL, and more in the .env file. Example values:
 
-- ALPINE_VERSION=3.18
-- ALPINE_BUILD=9
+- ALPINE_VERSION=3.19
+- ALPINE_BUILD=7
 - RUBYGEMS_URL=https://rubygems.org
 - NPM_URL=https://registry.npmjs.org
 - APK_URL=http://dl-cdn.alpinelinux.org

diff --git a/docs.openc3.com/docs/development/developing.md b/docs.openc3.com/docs/development/developing.md
@@ -45,8 +45,8 @@ openc3inc/openc3-ruby                       latest   aa158bbb9539   8 days ago
 
 If you're building in a offline environment or want to use a private Rubygems, NPM or APK server (e.g. Nexus), you can update the following environment variables: RUBYGEMS_URL, NPM_URL, APK_URL, and more in the [.env](https://github.com/openc3/cosmos/blob/main/.env) file. Example values:
 
-    ALPINE_VERSION=3.18<br/>
-    ALPINE_BUILD=9<br/>
+    ALPINE_VERSION=3.19<br/>
+    ALPINE_BUILD=7<br/>
     RUBYGEMS_URL=https://rubygems.org<br/>
     NPM_URL=https://registry.npmjs.org<br/>
     APK_URL=http://dl-cdn.alpinelinux.org<br/>

diff --git a/openc3-cosmos-cmd-tlm-api/Dockerfile b/openc3-cosmos-cmd-tlm-api/Dockerfile
@@ -15,8 +15,8 @@ RUN bundle config set --local without 'development' \
   # These need to be uninstalled with the --platform flag to avoid errors on linux-musl
   # See: https://github.com/protocolbuffers/protobuf/issues/16853#issuecomment-2583135716
   # Should be fixed April 2025
-  && gem uninstall grpc --platform=aarch64-linux --all --force \
-  && gem uninstall google-protobuf --platform=aarch64-linux --all --force \
+  && gem uninstall grpc --platform aarch64-linux --all --force \
+  && gem uninstall google-protobuf --platform aarch64-linux --all --force \
   && rm Gemfile.lock \
   && rm -rf /usr/lib/ruby/gems/*/cache/* \
   /var/cache/apk/* \

diff --git a/openc3-cosmos-cmd-tlm-api/Gemfile b/openc3-cosmos-cmd-tlm-api/Gemfile
@@ -38,7 +38,7 @@ group :development, :test do
 end
 
 group :test do
-  gem 'mock_redis', '0.45'
+  gem 'mock_redis', '~> 0.47'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

diff --git a/openc3-cosmos-cmd-tlm-api/app/controllers/packages_controller.rb b/openc3-cosmos-cmd-tlm-api/app/controllers/packages_controller.rb
@@ -49,7 +49,7 @@ def create
         OpenC3::Logger.error("Error installing package: #{file.original_filename}:#{e.formatted}", scope: params[:scope], user: username())
         render json: { status: 'error', message: e.message, type: e.class }, status: 400
       ensure
-        FileUtils.remove_entry(temp_dir) if temp_dir and File.exist?(temp_dir)
+        FileUtils.remove_entry_secure(temp_dir, true)
       end
     else
       OpenC3::Logger.error("Error installing package: Package file as params[:package] is required", scope: params[:scope], user: username())

diff --git a/openc3-cosmos-cmd-tlm-api/app/controllers/plugins_controller.rb b/openc3-cosmos-cmd-tlm-api/app/controllers/plugins_controller.rb
@@ -52,7 +52,7 @@ def create(update = false)
         render json: { status: 'error', message: error.message }, status: 500
         logger.error(error.formatted)
       ensure
-        FileUtils.remove_entry(temp_dir) if temp_dir and File.exist?(temp_dir)
+        FileUtils.remove_entry_secure(temp_dir, true)
       end
     else
       logger.error("No file received")

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/package.json
@@ -16,9 +16,9 @@
   "author": "Ben Keen, Jason Thomas",
   "license": "MIT",
   "devDependencies": {
-    "eslint": "9.19.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11"
+    "eslint": "9.20.1",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1"
   }
 }
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/package.json
@@ -15,13 +15,13 @@
     "@rushstack/eslint-patch": "1.10.5",
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vite-plugin-style-inject": "0.0.1",
     "vue": "3.5.13"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/requirements.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/requirements.txt
@@ -1 +1 @@
-numpy==2.2.2
+numpy==2.2.3
diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-admin/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-admin/package.json
@@ -14,20 +14,20 @@
     "@openc3/ace-diff": "6.1.1-beta0",
     "@openc3/js-common": "6.1.1-beta0",
     "@openc3/vue-common": "6.1.1-beta0",
-    "ace-builds": "1.37.5",
+    "ace-builds": "1.38.0",
     "single-spa-vue": "3.0.1"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-bucketexplorer/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-bucketexplorer/package.json
@@ -23,13 +23,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/package.json
@@ -23,13 +23,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdtlmserver/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdtlmserver/package.json
@@ -22,13 +22,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataextractor/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataextractor/package.json
@@ -22,13 +22,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataviewer/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataviewer/package.json
@@ -23,13 +23,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-handbooks/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-handbooks/package.json
@@ -23,13 +23,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-iframe/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-iframe/package.json
@@ -24,13 +24,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-limitsmonitor/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-limitsmonitor/package.json
@@ -23,13 +23,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-packetviewer/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-packetviewer/package.json
@@ -23,13 +23,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/package.json
@@ -13,7 +13,7 @@
     "@astrouxds/astro-web-components": "7.24.1",
     "@openc3/js-common": "6.1.1-beta0",
     "@openc3/vue-common": "6.1.1-beta0",
-    "ace-builds": "1.37.5",
+    "ace-builds": "1.38.0",
     "axios": "1.7.9",
     "date-fns": "4.1.0",
     "lodash": "4.17.21",
@@ -25,13 +25,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/...ns/packages/openc3-cosmos-tool-scriptrunner/src/tools/ScriptRunner/Dialogs/FileDialog.vue b/...ns/packages/openc3-cosmos-tool-scriptrunner/src/tools/ScriptRunner/Dialogs/FileDialog.vue
@@ -45,7 +45,7 @@
               <v-file-input
                 label="Choose File"
                 v-model="inputValue"
-                :rules="fileInputRules"
+                :rules="rules"
                 autofocus
                 data-test="file-input"
                 :accept="filter"
@@ -104,7 +104,15 @@ export default {
     return {
       inputValue: null,
       valid: null,
-      fileInputRules: [(value) => !!value?.length || 'Required'],
+      rules: [
+        (value) => {
+          if (this.multiple) {
+            return value.length != 0 || 'Required'
+          } else {
+            return !!value || 'Required'
+          }
+        },
+      ],
     }
   },
   computed: {

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tablemanager/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tablemanager/package.json
@@ -23,13 +23,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }

diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tlmgrapher/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tlmgrapher/package.json
@@ -25,13 +25,13 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.19.0",
+    "eslint": "9.20.1",
     "eslint-config-prettier": "10.0.1",
     "eslint-plugin-prettier": "5.2.3",
     "eslint-plugin-vue": "9.32.0",
-    "prettier": "3.4.2",
-    "sass": "1.83.4",
-    "vite": "6.0.11",
+    "prettier": "3.5.1",
+    "sass": "1.85.0",
+    "vite": "6.1.1",
     "vue": "3.5.13",
     "vue-eslint-parser": "9.4.3"
   }