diff --git a/.github/workflows/build_ubi.yml b/.github/workflows/build_ubi.yml index bf9f57c414..921b839704 100644 --- a/.github/workflows/build_ubi.yml +++ b/.github/workflows/build_ubi.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 # cache: "yarn" # cache-dependency-path: "**/yarn.lock" - name: login to ironbank diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index de45a7339e..c5e433087f 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 # cache: "yarn" # cache-dependency-path: "**/yarn.lock" - name: openc3.sh build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6568adfba5..6d75a39dab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: working-directory: openc3 - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 registry-url: "https://registry.npmjs.org" - name: Set up Python uses: actions/setup-python@v5 diff --git a/docs.openc3.com/package.json b/docs.openc3.com/package.json index 976549dd1d..405cc8ea8a 100644 --- a/docs.openc3.com/package.json +++ b/docs.openc3.com/package.json @@ -16,9 +16,9 @@ "write-heading-ids": "docusaurus write-heading-ids" }, "dependencies": { - "@docusaurus/core": "^3.4.0", - "@docusaurus/plugin-client-redirects": "^3.4.0", - "@docusaurus/preset-classic": "^3.4.0", + "@docusaurus/core": "^3.5.2", + "@docusaurus/plugin-client-redirects": "^3.5.2", + "@docusaurus/preset-classic": "^3.5.2", "@mdx-js/react": "3.0.1", "docusaurus-lunr-search": "3.4.0", "prism-react-renderer": "2.3.1", @@ -26,8 +26,8 @@ "react-dom": "18.3.1" }, "devDependencies": { - "@docusaurus/module-type-aliases": "^3.4.0", - "@docusaurus/types": "^3.3.2" + "@docusaurus/module-type-aliases": "^3.5.2", + "@docusaurus/types": "^3.5.2" }, "browserslist": { "production": [ diff --git a/openc3-cosmos-cmd-tlm-api/Dockerfile b/openc3-cosmos-cmd-tlm-api/Dockerfile index 9a8769a897..03cf704986 100644 --- a/openc3-cosmos-cmd-tlm-api/Dockerfile +++ b/openc3-cosmos-cmd-tlm-api/Dockerfile @@ -12,8 +12,6 @@ USER root RUN bundle config set --local without 'development' \ && bundle install --quiet \ - # Temporary until grpc updated - && gem uninstall google-protobuf -v "!= 3.24.0" --all \ && rm Gemfile.lock \ && rm -rf /usr/lib/ruby/gems/*/cache/* \ /var/cache/apk/* \ diff --git a/openc3-cosmos-cmd-tlm-api/config/puma.rb b/openc3-cosmos-cmd-tlm-api/config/puma.rb index 535c2b9cf6..4aa049bdd0 100644 --- a/openc3-cosmos-cmd-tlm-api/config/puma.rb +++ b/openc3-cosmos-cmd-tlm-api/config/puma.rb @@ -1,8 +1,7 @@ # Puma can serve each request in a thread from an internal thread pool. # The `threads` method setting takes two numbers: a minimum and maximum. # Any libraries that use thread pools should be configured to match -# the maximum value specified for Puma. Default is set to 5 threads for minimum -# and maximum; this matches the default thread size of Active Record. +# the maximum value specified for Puma. # max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } diff --git a/openc3-cosmos-init/plugins/openc3-tool-base/package.json b/openc3-cosmos-init/plugins/openc3-tool-base/package.json index 928b194511..9806325b4a 100644 --- a/openc3-cosmos-init/plugins/openc3-tool-base/package.json +++ b/openc3-cosmos-init/plugins/openc3-tool-base/package.json @@ -10,7 +10,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@rails/actioncable": "7.1.3-4", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "import-map-overrides": "3.1.1", "regenerator-runtime": "0.14.1", @@ -23,13 +23,13 @@ }, "__comment__": "NOTE: sass can't be upgraded until Vuetify 3 to avoid tons of deprecation warnings", "devDependencies": { - "@babel/core": "7.24.9", + "@babel/core": "7.25.2", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-transform-runtime": "7.24.7", - "@babel/preset-env": "7.24.8", - "@babel/runtime": "7.24.8", + "@babel/preset-env": "7.25.3", + "@babel/runtime": "7.25.0", "@types/systemjs": "6.13.5", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "copy-webpack-plugin": "12.0.2", "eslint": "8.56.0", "html-webpack-plugin": "5.6.0", @@ -43,6 +43,6 @@ "webpack-cli": "5.1.4", "webpack-config-single-spa": "5.3.1", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0" + "webpack-merge": "6.0.1" } } 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 index 605bef705d..2934d68d51 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/package.json @@ -18,14 +18,14 @@ "author": "Ben Keen, Jason Thomas", "license": "MIT", "devDependencies": { - "@babel/core": "^7.24.9", + "@babel/core": "^7.25.2", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-transform-runtime": "7.24.7", - "@babel/preset-env": "^7.24.8", - "@babel/runtime": "7.24.8", + "@babel/preset-env": "^7.25.3", + "@babel/runtime": "7.25.0", "@webpack-cli/generators": "^3.0.7", "babel-loader": "^9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "file-loader": "^6.2.0", "prettier": "3.3.3", @@ -34,7 +34,7 @@ "webpack": "^5.93.0", "webpack-cli": "^5.1.4", "webpack-dev-server": "5.0.4", - "webpack-merge": "5.10.0", + "webpack-merge": "6.0.1", "webpack-remove-empty-scripts": "^1.0.4" } } diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/package.json index 1e078d489b..1680850ea4 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/package.json @@ -12,8 +12,8 @@ "vuetify": "2.7.1" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", - "@rushstack/eslint-patch": "1.10.3", + "@babel/eslint-parser": "7.25.1", + "@rushstack/eslint-patch": "1.10.4", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -21,7 +21,7 @@ "@vue/cli-service": "5.0.8", "@vue/eslint-config-prettier": "9.0.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/screens/commanding.txt b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/screens/commanding.txt index 3668da1a21..e2a68a227a 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/screens/commanding.txt +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/screens/commanding.txt @@ -43,7 +43,7 @@ VERTICAL END VERTICALBOX "Run Script:" - NAMED_WIDGET SCRIPTNAME COMBOBOX collect.rb checks.rb + NAMED_WIDGET SCRIPTNAME COMBOBOX collect.py checks.py NAMED_WIDGET BG CHECKBUTTON 'Background' # The backslash '\' character indicates string concatenation without newlines. # NOTE: Both lines must use the same quote character: ' or " 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 index ed9d3ae66b..6bf07e72f9 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-admin/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-admin/package.json @@ -24,7 +24,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -35,7 +35,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index 18df2f911d..fc0d862b90 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-bucketexplorer/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-bucketexplorer/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "lodash": "4.17.21", "portal-vue": "2.1.7", @@ -26,7 +26,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -37,7 +37,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index 4e5fc6a695..fb6265e5f9 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdsender/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "portal-vue": "2.1.7", "single-spa-vue": "2.5.1", @@ -25,8 +25,8 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", - "@rushstack/eslint-patch": "1.10.3", + "@babel/eslint-parser": "7.25.1", + "@rushstack/eslint-patch": "1.10.4", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -37,7 +37,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index 01a1378a62..05878187c0 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdtlmserver/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-cmdtlmserver/package.json @@ -25,7 +25,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -36,7 +36,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index 52abe698a8..4b6ae01630 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataextractor/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataextractor/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "portal-vue": "2.1.7", "single-spa-vue": "2.5.1", @@ -25,7 +25,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -36,7 +36,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index 991531b112..493d1821bd 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataviewer/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-dataviewer/package.json @@ -26,7 +26,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -37,7 +37,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index bb259ba2f4..795c50386c 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-handbooks/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-handbooks/package.json @@ -26,7 +26,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -37,7 +37,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index bdaff660ae..ac3bf514cb 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-iframe/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-iframe/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "lodash": "4.17.21", "portal-vue": "2.1.7", @@ -26,7 +26,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -37,7 +37,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index b8796e3988..4bb100929b 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-limitsmonitor/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-limitsmonitor/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "lodash": "4.17.21", "portal-vue": "2.1.7", @@ -26,7 +26,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -37,7 +37,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index f236bdc959..b4267cd6d6 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-packetviewer/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-packetviewer/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "lodash": "4.17.21", "portal-vue": "2.1.7", @@ -26,7 +26,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -37,7 +37,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index 6069a6e6a0..a0ba0744bd 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/package.json @@ -14,7 +14,7 @@ "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", "ace-builds": "1.35.4", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "lodash": "4.17.21", "portal-vue": "2.1.7", @@ -28,7 +28,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -39,7 +39,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index 1b483a4bc4..3000e18c0e 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tablemanager/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tablemanager/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", - "axios": "1.7.2", + "axios": "1.7.4", "date-fns": "3.6.0", "lodash": "4.17.21", "portal-vue": "2.1.7", @@ -26,7 +26,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -37,7 +37,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", 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 index 0c8f5c88eb..957367e3df 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tlmgrapher/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tlmgrapher/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", - "axios": "1.7.2", + "axios": "1.7.4", "binary-search": "1.3.6", "date-fns": "3.6.0", "lodash": "4.17.21", @@ -28,7 +28,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -39,7 +39,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tlmviewer/package.json b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tlmviewer/package.json index 636bb3b757..3d4425ff0d 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tlmviewer/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-tlmviewer/package.json @@ -14,7 +14,7 @@ "@astrouxds/astro-web-components": "7.22.1", "@openc3/tool-common": "5.17.2-beta0", "ace-builds": "1.35.4", - "axios": "1.7.2", + "axios": "1.7.4", "binary-search": "1.3.6", "date-fns": "3.6.0", "lodash": "4.17.21", @@ -29,7 +29,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -40,7 +40,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/package.json b/openc3-cosmos-init/plugins/packages/openc3-tool-common/package.json index 57b2cd6f0f..0d7b497b24 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/package.json +++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/package.json @@ -4,7 +4,7 @@ "dependencies": { "@astrouxds/astro-web-components": "7.22.1", "@rails/actioncable": "7.1.3-4", - "axios": "1.7.2", + "axios": "1.7.4", "binary-search": "1.3.6", "date-fns": "3.6.0", "date-fns-tz": "3.1.3", diff --git a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/services/api.js b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/services/api.js index 0568dda409..fab3abeee3 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/services/api.js +++ b/openc3-cosmos-init/plugins/packages/openc3-tool-common/src/services/api.js @@ -31,13 +31,13 @@ const request = async function ( headers, noAuth = false, noScope = false, - onUploadProgress = {}, - } = {}, + onUploadProgress = false, + } = {} ) { if (!noAuth) { try { let refreshed = await OpenC3Auth.updateToken( - OpenC3Auth.defaultMinValidity, + OpenC3Auth.defaultMinValidity ) if (refreshed) { OpenC3Auth.setTokens() @@ -82,7 +82,7 @@ export default { noScope, noAuth, onUploadProgress, - } = {}, + } = {} ) { return request('get', path, { params, @@ -102,7 +102,7 @@ export default { noScope, noAuth, onUploadProgress, - } = {}, + } = {} ) { return request('put', path, { data, @@ -123,7 +123,7 @@ export default { noScope, noAuth, onUploadProgress, - } = {}, + } = {} ) { return request('post', path, { data, @@ -143,7 +143,7 @@ export default { noScope, noAuth, onUploadProgress, - } = {}, + } = {} ) { return request('delete', path, { params, diff --git a/openc3-cosmos-script-runner-api/Dockerfile b/openc3-cosmos-script-runner-api/Dockerfile index 960cf09836..642b28b763 100644 --- a/openc3-cosmos-script-runner-api/Dockerfile +++ b/openc3-cosmos-script-runner-api/Dockerfile @@ -12,8 +12,6 @@ USER root RUN bundle config set --local without 'development' \ && bundle install --quiet \ - # Temporary until grpc updated - && gem uninstall google-protobuf -v "!= 3.24.0" --all \ && rm Gemfile.lock \ && rm -rf /usr/lib/ruby/gems/*/cache/* \ /var/cache/apk/* \ diff --git a/openc3-cosmos-script-runner-api/config/puma.rb b/openc3-cosmos-script-runner-api/config/puma.rb index 53f7aaae0b..6915a63637 100644 --- a/openc3-cosmos-script-runner-api/config/puma.rb +++ b/openc3-cosmos-script-runner-api/config/puma.rb @@ -1,8 +1,7 @@ # Puma can serve each request in a thread from an internal thread pool. # The `threads` method setting takes two numbers: a minimum and maximum. # Any libraries that use thread pools should be configured to match -# the maximum value specified for Puma. Default is set to 5 threads for minimum -# and maximum; this matches the default thread size of Active Record. +# the maximum value specified for Puma. # max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } diff --git a/openc3/Dockerfile b/openc3/Dockerfile index 60d0bdfe7e..f900d16812 100644 --- a/openc3/Dockerfile +++ b/openc3/Dockerfile @@ -23,12 +23,6 @@ RUN mkdir -p lib/openc3/ext \ && ln -s $openc3_gem/openc3 $openc3_gem/cosmos \ && mkdir -p gems \ && mv *.gem gems/. \ - # TODO: Remove google-protobuf / grpc manually install once grpc fixed - # Uninstall twice is intentional because --all doesn't work - && gem install google-protobuf -v 3.24.0 --platform ruby \ - && gem install grpc -v 1.59.2 \ - && gem uninstall google-protobuf -v "!= 3.24.0" --all \ - && gem uninstall google-protobuf -v "!= 3.24.0" --all \ && gem cleanup \ && rm -rf /usr/lib/ruby/gems/*/cache/* /var/cache/apk/* /tmp/* /var/tmp/* diff --git a/openc3/templates/tool_angular/package.json b/openc3/templates/tool_angular/package.json index 61ad6f2fe5..cc62bcf027 100644 --- a/openc3/templates/tool_angular/package.json +++ b/openc3/templates/tool_angular/package.json @@ -28,7 +28,7 @@ "single-spa": "5.9.5", "single-spa-angular": "^9.0.1", "tslib": "^2.6.2", - "zone.js": "~0.14.3" + "zone.js": "~0.14.10" }, "devDependencies": { "@angular-builders/custom-webpack": "17.0.2", @@ -36,8 +36,8 @@ "@angular/cli": "~17.3.6", "@angular/compiler-cli": "^17.0.6", "@types/jasmine": "~5.1.4", - "jasmine-core": "~5.1.1", - "karma": "~6.4.0", + "jasmine-core": "~5.2.0", + "karma": "~6.4.4", "karma-chrome-launcher": "~3.2.0", "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", diff --git a/openc3/templates/tool_react/package.json b/openc3/templates/tool_react/package.json index 920014ea63..94c6139554 100644 --- a/openc3/templates/tool_react/package.json +++ b/openc3/templates/tool_react/package.json @@ -15,20 +15,20 @@ "dependencies": { "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", - "@mui/material": "^5.15.3", + "@mui/material": "^5.16.7", "react": "^18.2.0", "react-dom": "^18.2.0", "single-spa-react": "^5.1.4" }, "devDependencies": { - "@babel/core": "^7.23.7", - "@babel/eslint-parser": "^7.23.3", + "@babel/core": "^7.25.2", + "@babel/eslint-parser": "^7.25.1", "@babel/plugin-transform-runtime": "^7.23.7", - "@babel/preset-env": "^7.23.8", + "@babel/preset-env": "^7.25.3", "@babel/preset-react": "^7.23.3", - "@babel/runtime": "^7.23.8", - "@testing-library/jest-dom": "^6.2.0", - "@testing-library/react": "^14.1.2", + "@babel/runtime": "^7.25.0", + "@testing-library/jest-dom": "^6.4.8", + "@testing-library/react": "^16.0.0", "babel-jest": "^29.7.0", "concurrently": "^8.2.2", "cross-env": "^7.0.3", @@ -45,6 +45,6 @@ "webpack-cli": "^5.1.4", "webpack-config-single-spa-react": "^4.0.5", "webpack-dev-server": "^5.0.4", - "webpack-merge": "^5.10.0" + "webpack-merge": "^6.0.1" } } diff --git a/openc3/templates/tool_svelte/package.json b/openc3/templates/tool_svelte/package.json index 15cc7ca581..51f476a5c5 100644 --- a/openc3/templates/tool_svelte/package.json +++ b/openc3/templates/tool_svelte/package.json @@ -17,25 +17,25 @@ "@smui/card": "^7.0.0-beta.16", "@smui/list": "^7.0.0-beta.16", "@smui/menu": "^7.0.0-beta.16", - "axios": "1.7.2", + "axios": "1.7.4", "single-spa-svelte": "^2.1.1", "sirv-cli": "^2.0.2", "svelte-portal": "^2.2.0" }, "devDependencies": { - "@babel/core": "^7.23.7", - "@babel/preset-env": "^7.23.8", + "@babel/core": "^7.25.2", + "@babel/preset-env": "^7.25.3", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-node-resolve": "^15.2.3", - "@testing-library/jest-dom": "^6.2.0", - "@testing-library/svelte": "^5.2.0", + "@testing-library/jest-dom": "^6.4.8", + "@testing-library/svelte": "^5.2.1", "babel-jest": "^29.7.0", "concurrently": "^8.2.2", "jest": "^29.7.0", - "postcss": "^8.4.33", + "postcss": "^8.4.41", "prettier": "^3.1.1", "prettier-plugin-svelte": "^3.1.2", - "rollup": "^4.9.4", + "rollup": "^4.20.0", "rollup-plugin-livereload": "^2.0.5", "rollup-plugin-postcss": "^4.0.2", "rollup-plugin-svelte": "^7.1.6", diff --git a/openc3/templates/tool_vue/package.json b/openc3/templates/tool_vue/package.json index 97eb7a61ca..2e9dfe034a 100644 --- a/openc3/templates/tool_vue/package.json +++ b/openc3/templates/tool_vue/package.json @@ -25,7 +25,7 @@ "vuex": "3.6.2" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", + "@babel/eslint-parser": "7.25.1", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -36,7 +36,7 @@ "@vue/eslint-config-prettier": "9.0.0", "@vue/test-utils": "1.3.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", diff --git a/openc3/templates/widget/package.json b/openc3/templates/widget/package.json index 7753331c6d..54a4207f29 100644 --- a/openc3/templates/widget/package.json +++ b/openc3/templates/widget/package.json @@ -12,8 +12,8 @@ "vuetify": "2.7.1" }, "devDependencies": { - "@babel/eslint-parser": "7.24.8", - "@rushstack/eslint-patch": "1.10.3", + "@babel/eslint-parser": "7.25.1", + "@rushstack/eslint-patch": "1.10.4", "@vue/babel-preset-app": "5.0.8", "@vue/cli": "5.0.8", "@vue/cli-plugin-babel": "5.0.8", @@ -21,7 +21,7 @@ "@vue/cli-service": "5.0.8", "@vue/eslint-config-prettier": "9.0.0", "babel-loader": "9.1.3", - "babel-plugin-istanbul": "6.1.1", + "babel-plugin-istanbul": "7.0.0", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", diff --git a/playwright/package.json b/playwright/package.json index ade884f42c..65b4798e9d 100644 --- a/playwright/package.json +++ b/playwright/package.json @@ -11,10 +11,10 @@ "clean": "rm -rf .nyc_output || rmdir /s /q .nyc_output; rm -rf coverage || rmdir /s /q coverage; rm -rf test-results || rmdir /s /q test-results" }, "dependencies": { - "@playwright/test": "1.45.3", + "@playwright/test": "1.46.0", "date-fns": "^3.2.0", "jszip": "^3.10.1", - "nyc": "^15.1.0", + "nyc": "^17.0.0", "prettier": "^3.1.1" }, "nyc": { diff --git a/playwright/tests/tlm-viewer.spec.ts b/playwright/tests/tlm-viewer.spec.ts index 70fb92919d..7889933544 100644 --- a/playwright/tests/tlm-viewer.spec.ts +++ b/playwright/tests/tlm-viewer.spec.ts @@ -13,7 +13,7 @@ # GNU Affero General Public License for more details. # # Modified by OpenC3, Inc. -# All changes Copyright 2023, OpenC3, Inc. +# All changes Copyright 2024, OpenC3, Inc. # All Rights Reserved */ @@ -32,11 +32,12 @@ test.beforeEach(async ({ page, utils }) => { }) }) -async function showScreen(page, target, screen, callback = null) { +async function showScreen(page, utils, target, screen, callback = null) { await page.locator('div[role="button"]:has-text("Select Target")').click() await page.locator(`.v-list-item__title:text-is("${target}")`).click() await page.locator('div[role="button"]:has-text("Select Screen")').click() await page.locator(`.v-list-item__title:text-is("${screen}")`).click() + await utils.sleep(500) // Allow screen to display so we don't double display await page.locator('[data-test="show-screen"]').click() await expect( page.locator(`.v-system-bar:has-text("${target} ${screen}")`), @@ -61,19 +62,19 @@ test('changes targets', async ({ page, utils }) => { }) test('displays INST ADCS', async ({ page, utils }) => { - await showScreen(page, 'INST', 'ADCS') + await showScreen(page, utils, 'INST', 'ADCS') }) test('displays INST ARRAY', async ({ page, utils }) => { - await showScreen(page, 'INST', 'ARRAY') + await showScreen(page, utils, 'INST', 'ARRAY') }) test('displays INST BLOCK', async ({ page, utils }) => { - await showScreen(page, 'INST', 'BLOCK') + await showScreen(page, utils, 'INST', 'BLOCK') }) test('displays INST COMMANDING', async ({ page, utils }) => { - await showScreen(page, 'INST', 'COMMANDING', async function () { + await showScreen(page, utils, 'INST', 'COMMANDING', async function () { await page.getByRole('button', { name: 'NORMAL' }).click() await page.getByRole('option', { name: 'NORMAL' }).click() await page.getByRole('button', { name: 'Start Collect' }).click() @@ -98,15 +99,15 @@ test('displays INST COMMANDING', async ({ page, utils }) => { }) test('displays INST GRAPHS', async ({ page, utils }) => { - await showScreen(page, 'INST', 'GRAPHS') + await showScreen(page, utils, 'INST', 'GRAPHS') }) test('displays INST GROUND', async ({ page, utils }) => { - await showScreen(page, 'INST', 'GROUND') + await showScreen(page, utils, 'INST', 'GROUND') }) test('displays INST HS', async ({ page, utils }) => { - await showScreen(page, 'INST', 'HS', async function () { + await showScreen(page, utils, 'INST', 'HS', async function () { await expect(page.locator('text=Health and Status')).toBeVisible() await page.locator('[data-test=minimize-screen-icon]').click() await expect(page.locator('text=Health and Status')).not.toBeVisible() @@ -116,11 +117,11 @@ test('displays INST HS', async ({ page, utils }) => { }) test('displays INST IMAGE', async ({ page, utils }) => { - await showScreen(page, 'INST', 'IMAGE') + await showScreen(page, utils, 'INST', 'IMAGE') }) test('displays INST LATEST', async ({ page, utils }) => { - await showScreen(page, 'INST', 'LATEST') + await showScreen(page, utils, 'INST', 'LATEST') }) test('displays INST LAUNCHER', async ({ page, utils }) => { @@ -161,24 +162,24 @@ test('displays INST LAUNCHER', async ({ page, utils }) => { }) test('displays INST LIMITS', async ({ page, utils }) => { - await showScreen(page, 'INST', 'LIMITS') + await showScreen(page, utils, 'INST', 'LIMITS') }) test('displays INST OTHER', async ({ page, utils }) => { - await showScreen(page, 'INST', 'OTHER') + await showScreen(page, utils, 'INST', 'OTHER') }) test('displays INST PARAMS', async ({ page, utils }) => { - await showScreen(page, 'INST', 'PARAMS') + await showScreen(page, utils, 'INST', 'PARAMS') }) test('displays INST ROLLUP', async ({ page, utils }) => { - await showScreen(page, 'INST', 'ROLLUP') + await showScreen(page, utils, 'INST', 'ROLLUP') }) test('displays INST SIMPLE', async ({ page, utils }) => { const text = 'TEST' + Math.floor(Math.random() * 10000) - await showScreen(page, 'INST', 'SIMPLE', async function () { + await showScreen(page, utils, 'INST', 'SIMPLE', async function () { await expect(page.locator(`text=${text}`)).not.toBeVisible() await page.locator('[data-test=edit-screen-icon]').click() await page.locator('textarea').fill(` @@ -208,11 +209,11 @@ test('displays INST SIMPLE', async ({ page, utils }) => { }) test('displays INST TABS', async ({ page, utils }) => { - await showScreen(page, 'INST', 'TABS') + await showScreen(page, utils, 'INST', 'TABS') }) test('displays INST WEB', async ({ page, utils }) => { - await showScreen(page, 'INST', 'WEB') + await showScreen(page, utils, 'INST', 'WEB') }) // Create the screen name as upcase because OpenC3 upcases the name