Merge branch 'main' into view-parser-plugin-decomposition

player-ui · Jul 26, 2024 · 6b54598 · 6b54598
2 parents 0ed9b29 + 81061cf
commit 6b54598
Show file tree

Hide file tree

Showing 8 changed files with 554 additions and 576 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -13,17 +13,17 @@ archive_override(
 )
 #local_path_override(module_name = "rules_player", path = "../rules_player")
 
-bazel_dep(name = "aspect_bazel_lib", version = "1.39.0")
-bazel_dep(name = "aspect_rules_js", version = "1.34.1")
-bazel_dep(name = "bazel_skylib", version = "1.4.2")
-bazel_dep(name = "rules_pkg", version = "0.9.1")
-bazel_dep(name = "aspect_rules_ts", version = "2.1.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.8")
+bazel_dep(name = "aspect_rules_js", version = "1.42.3")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "aspect_rules_ts", version = "2.4.2")
 
 ####### Node.js version #########
-bazel_dep(name = "rules_nodejs", version = "6.0.2")
+bazel_dep(name = "rules_nodejs", version = "6.2.0")
 
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
-node.toolchain(node_version = "18.18.0")
+node.toolchain(node_version = "20.14.0")
 #################################
 
 ###### Start iOS ######

diff --git a/core/player/src/view/parser/index.ts b/core/player/src/view/parser/index.ts
@@ -96,15 +96,12 @@ export class Parser {
       obj,
       type,
       options,
-    ) as Node.Node;
+    ) as Node.Node | null;
 
-    if (parsedNode) {
+    if (parsedNode || parsedNode === null) {
       return parsedNode;
     }
 
-    /**
-     *
-     */
     const parseLocalObject = (
       currentValue: any,
       objToParse: unknown,

diff --git a/core/player/src/view/plugins/__tests__/asset.test.ts b/core/player/src/view/plugins/__tests__/asset.test.ts
@@ -14,8 +14,6 @@ import {
   SwitchPlugin,
 } from "..";
 
-const parseBinding = new BindingParser().parse;
-
 describe("asset", () => {
   let parser: Parser;
 
@@ -72,6 +70,7 @@ describe("asset", () => {
   });
 
   it("template", () => {
+    const parseBinding = new BindingParser().parse;
     const model: DataModelWithParser = withParser(
       new LocalModel(),
       parseBinding,

diff --git a/core/player/src/view/plugins/applicability.ts b/core/player/src/view/plugins/applicability.ts
@@ -54,7 +54,7 @@ export default class ApplicabilityPlugin implements ViewPlugin {
           );
 
           if (!parsedApplicability) {
-            return childOptions ? [] : undefined;
+            return childOptions ? [] : null;
           }
 
           const applicabilityNode = parser.createASTNode(
@@ -67,7 +67,7 @@ export default class ApplicabilityPlugin implements ViewPlugin {
           );
 
           if (!applicabilityNode) {
-            return childOptions ? [] : undefined;
+            return childOptions ? [] : null;
           }
 
           if (applicabilityNode.type === NodeType.Applicability) {

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "test": "bazel test -- $(bazel query \"kind(nodejs_test, //...)\" --output label 2>/dev/null | tr '\\n' ' ')"
   },
   "engines": {
-    "node": "^18.8.0",
+    "node": "^20.14.0",
     "pnpm": "^8.9.2"
   },
   "packageManager": "pnpm@8.9.2",
@@ -179,7 +179,7 @@
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "tslib": "^2.6.2",
     "tsup": "^8.0.1",
-    "typescript": "5.3.2",
+    "typescript": "5.5.3",
     "uuid": "^8.3.2",
     "vite": "^4.0.0",
     "vitest": "^1.0.2",
@@ -188,9 +188,8 @@
     "webpack-dev-server": "^5.0.4"
   },
   "volta": {
-    "node": "18.18.0",
-    "yarn": "1.22.19",
-    "pnpm": "8.9.2"
+    "node": "20.14.0",
+    "pnpm": "8.15.1"
   },
   "resolutions": {
     "esbuild": "0.19.8",