Merge branch 'base' into tabbar

tsconfig.json

@@ -3,7 +3,7 @@
     "composite": true,
     "skipLibCheck": true,
     "module": "ESNext",
-    "moduleResolution": "bundler",
+    "moduleResolution": "Node",
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
     "baseUrl": ".",