Merge branch 'master' into dependabot/npm_and_yarn/src/explorer/mimie…

…xplorer-app/async-2.6.4
mimiframework · Apr 20, 2022 · a24e660 · a24e660
2 parents ef19c11 + bf34b77
commit a24e660
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/src/core/time_arrays.jl b/src/core/time_arrays.jl
@@ -28,7 +28,7 @@ function get_time_index_position(obj::AbstractCompositeComponentDef, comp_name::
 	get_time_index_position(dim_names(compdef(obj, comp_name), datum_name))
 end
 
-const AnyIndex = Union{Int, Vector{Int}, Tuple, Colon, OrdinalRange}
+const AnyIndex = Union{Int, Vector{Int}, Tuple, Colon, OrdinalRange, Vector{Bool}}
 
 # Helper function for getindex; throws a MissingException if data is missing, otherwise returns data
 function _missing_data_check(data, t)

diff --git a/src/explorer/mimiexplorer-app/package-lock.json b/src/explorer/mimiexplorer-app/package-lock.json
diff --git a/src/explorer/mimiexplorer-app/package.json b/src/explorer/mimiexplorer-app/package.json
@@ -13,7 +13,7 @@
     "@types/node": "^12.12.47",
     "@types/react": "^16.9.38",
     "@types/react-dom": "^16.9.8",
-    "electron": "^11.5.0",
+    "electron": "^13.6.6",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-scripts": "3.4.1",