@nrwl/expo 14.4.4 → 14.4.6

package/migrations.json

@@ -17,6 +17,24 @@
       "cli": "nx",
       "description": "Add target build and build-list for expo projects in project.json",
       "factory": "./src/migrations/update-14-4-3/add-eas-build-target"
+    },
+    "add-update-target-14-5-1": {
+      "version": "14.5.1-beta.0",
+      "cli": "nx",
+      "description": "Add target update for expo projects in project.json",
+      "factory": "./src/migrations/update-14-5-1/add-eas-update-target"
+    },
+    "change-expo-jest-preset": {
+      "version": "15.0.3-beta.0",
+      "cli": "nx",
+      "description": "Change jest config preset tof expo projects",
+      "factory": "./src/migrations/update-15-0-3/change-jest-preset"
+    },
+    "add-new-expo-cli-targets": {
+      "version": "15.0.3-beta.0",
+      "cli": "nx",
+      "description": "Add targets for @expo/cli and replace eject target",
+      "factory": "./src/migrations/update-15-0-3/add-new-expo-cli-targets"
     }
   },
   "packageJsonUpdates": {
@@ -245,6 +263,362 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "14.5.1": {
+      "version": "14.5.1-beta.0",
+      "packages": {
+        "expo": {
+          "version": "46.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-dev-client": {
+          "version": "~1.1.1",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-status-bar": {
+          "version": "~1.4.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-config": {
+          "version": "0.3.21",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-splash-screen": {
+          "version": "~0.16.1",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-updates": {
+          "version": "~0.14.3",
+          "alwaysAddToPackageJson": false
+        },
+        "jest-expo": {
+          "version": "46.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-cli": {
+          "version": "6.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "eas-cli": {
+          "version": "0.57.0",
+          "alwaysAddToPackageJson": false
+        },
+        "babel-preset-expo": {
+          "version": "~9.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "0.69.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-native": {
+          "version": "0.69.5",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-web": {
+          "version": "~0.18.7",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-gesture-handler": {
+          "version": "~2.5.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-reanimated": {
+          "version": "~2.9.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-safe-area-context": {
+          "version": "4.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-screens": {
+          "version": "~3.15.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "12.4.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@svgr/webpack": {
+          "version": "^6.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "metro-resolver": {
+          "version": "0.72.0",
+          "alwaysAddToPackageJson": false
+        },
+        "metro-babel-register": {
+          "version": "0.72.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react-native": {
+          "version": "11.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "14.5.2": {
+      "version": "14.5.2-beta.0",
+      "packages": {
+        "expo": {
+          "version": "46.0.9",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-cli": {
+          "version": "6.0.5",
+          "alwaysAddToPackageJson": false
+        },
+        "eas-cli": {
+          "version": "1.1.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "0.69.4",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "13.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "metro-resolver": {
+          "version": "0.72.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/jest-native": {
+          "version": "4.0.11",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-config": {
+          "version": "0.3.22",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "14.5.3": {
+      "version": "14.5.3-beta.0",
+      "packages": {
+        "expo": {
+          "version": "46.0.10",
+          "alwaysAddToPackageJson": false
+        },
+        "eas-cli": {
+          "version": "2.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "0.69.5",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-native": {
+          "version": "0.69.8",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "13.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "metro-resolver": {
+          "version": "0.72.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "15.0.0": {
+      "version": "15.0.0-beta.0",
+      "packages": {
+        "metro-resolver": {
+          "version": "0.72.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react-native": {
+          "version": "11.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/jest-native": {
+          "version": "4.0.13",
+          "alwaysAddToPackageJson": false
+        },
+        "expo": {
+          "version": "46.0.13",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-cli": {
+          "version": "6.0.6",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "0.69.6",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "15.0.3": {
+      "version": "15.0.3-beta.0",
+      "packages": {
+        "@testing-library/react-native": {
+          "version": "11.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/jest-native": {
+          "version": "5.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "expo": {
+          "version": "46.0.16",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-cli": {
+          "version": "6.0.6",
+          "alwaysAddToPackageJson": false
+        },
+        "eas-cli": {
+          "version": "2.4.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/cli": {
+          "version": "0.3.2",
+          "alwaysAddToPackageJson": false,
+          "addToPackageJson": "devDependencies"
+        }
+      }
+    },
+    "15.2.2": {
+      "version": "15.2.2-beta.0",
+      "packages": {
+        "metro-resolver": {
+          "version": "0.73.3",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "15.3.0": {
+      "version": "15.3.0-beta.0",
+      "packages": {
+        "@testing-library/react-native": {
+          "version": "11.5.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/jest-native": {
+          "version": "5.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "expo": {
+          "version": "47.0.8",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-config": {
+          "version": "0.5.1",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-splash-screen": {
+          "version": "~0.17.5",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-cli": {
+          "version": "6.0.8",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/cli": {
+          "version": "0.4.10",
+          "alwaysAddToPackageJson": false
+        },
+        "eas-cli": {
+          "version": "2.8.0",
+          "alwaysAddToPackageJson": false
+        },
+        "babel-preset-expo": {
+          "version": "~9.2.2",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "0.70.5",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-native": {
+          "version": "0.70.7",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "13.3.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@svgr/webpack": {
+          "version": "^6.5.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "15.4.3": {
+      "version": "15.4.3-beta.0",
+      "packages": {
+        "expo": {
+          "version": "47.0.9",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-config": {
+          "version": "0.5.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/webpack-config": {
+          "version": "~0.17.3",
+          "alwaysAddToPackageJson": false,
+          "addToPackageJson": "dependencies"
+        },
+        "eas-cli": {
+          "version": "3.1.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-web": {
+          "version": "~0.18.10",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "13.4.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "15.6.2": {
+      "version": "15.6.2-beta.0",
+      "packages": {
+        "expo": {
+          "version": "47.0.13",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/webpack-config": {
+          "version": "~0.17.4",
+          "alwaysAddToPackageJson": false
+        },
+        "eas-cli": {
+          "version": "3.3.2",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-cli": {
+          "version": "6.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/cli": {
+          "version": "0.4.11",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "15.7.2": {
+      "version": "15.7.2-beta.0",
+      "packages": {
+        "@expo/webpack-config": {
+          "version": "~18.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "eas-cli": {
+          "version": "3.5.2",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-cli": {
+          "version": "6.3.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@nrwl/expo",
-  "version": "14.4.4",
-  "description": "Expo Plugin for Nx",
+  "version": "14.4.6",
+  "private": false,
+  "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
     "Monorepo",
     "Expo",
@@ -22,26 +23,28 @@
   },
   "license": "MIT",
   "author": "Victor Savkin",
-  "main": "index.js",
+  "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nrwl/detox": "*",
-    "@nrwl/devkit": "*",
-    "@nrwl/jest": "*",
-    "@nrwl/linter": "*",
-    "@nrwl/react": "*",
-    "@nrwl/workspace": "*",
-    "chalk": "4.1.0",
+    "@nrwl/detox": "15.4.6",
+    "@nrwl/devkit": "15.4.6",
+    "@nrwl/jest": "15.4.6",
+    "@nrwl/js": "15.4.6",
+    "@nrwl/linter": "15.4.6",
+    "@nrwl/react": "15.4.6",
+    "@nrwl/webpack": "14.4.6",
+    "@nrwl/workspace": "15.4.6",
+    "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
-    "eas-cli": "^0.55.1",
-    "expo-cli": "^5.5.1",
-    "metro-resolver": "^0.71.0",
+    "fs-extra": "^11.1.0",
+    "metro-resolver": "^0.74.1",
+    "node-fetch": "^2.6.7",
     "tar-fs": "^2.1.1",
-    "tsconfig-paths": "^3.9.0",
-    "tsconfig-paths-webpack-plugin": "^3.5.2"
+    "tsconfig-paths": "^4.1.2",
+    "tsconfig-paths-webpack-plugin": "^4.0.0"
   },
   "peerDependencies": {
-    "expo": "^45.0.6"
+    "expo": "^47.0.13"
   },
   "builders": "./executors.json",
   "ng-update": {
@@ -49,5 +52,8 @@
     "migrations": "./migrations.json"
   },
   "schematics": "./generators.json",
-  "typings": "./index.d.ts"
-}
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "86760de14dc219bf9e440be4c5c14c7affaf32e1"
+}

package/plugins/metro-resolver.js

@@ -21,7 +21,8 @@ function getResolveRequest(extensions) {
         if (debug)
             console.log(chalk.cyan(`[Nx] Resolving: ${realModuleName}`));
         const { resolveRequest } = _context, context = tslib_1.__rest(_context, ["resolveRequest"]);
-        const resolvedPath = defaultMetroResolver(context, realModuleName, platform, debug) ||
+        const resolvedPath = resolveRequestFromContext(resolveRequest, _context, realModuleName, platform, debug) ||
+            defaultMetroResolver(context, realModuleName, platform, debug) ||
             tsconfigPathsResolver(context, extensions, realModuleName, platform, debug) ||
             pnpmResolver(extensions, context, realModuleName, debug);
         if (resolvedPath) {
@@ -31,6 +32,15 @@ function getResolveRequest(extensions) {
     };
 }
 exports.getResolveRequest = getResolveRequest;
+function resolveRequestFromContext(resolveRequest, context, realModuleName, platform, debug) {
+    try {
+        return resolveRequest(context, realModuleName, platform);
+    }
+    catch (_a) {
+        if (debug)
+            console.log(chalk.cyan(`[Nx] Unable to resolve with default resolveRequest: ${realModuleName}`));
+    }
+}
 /**
  * This function try to resolve path using metro's default resolver
  * @returns path if resolved, else undefined
@@ -115,6 +125,7 @@ function getPnpmResolver(extensions) {
             extensions: extensions.map((extension) => '.' + extension),
             useSyncFileSystemCalls: true,
             modules: [(0, path_1.join)(devkit_1.workspaceRoot, 'node_modules'), 'node_modules'],
+            conditionNames: ['native', 'browser', 'require', 'default'],
         });
     }
     return resolver;

package/plugins/metro-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"metro-resolver.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/metro-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"metro-resolver.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/metro-resolver.ts"],"names":[],"mappings":"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"}

package/plugins/with-nx-webpack.d.ts

@@ -1,4 +1,4 @@
 /**
- * This function add addtional rules to expo's webpack config to make expo web working
+ * This function add additional rules to expo's webpack config to make expo web working
  */
 export declare function withNxWebpack(config: any): Promise<any>;

package/plugins/with-nx-webpack.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const path_1 = require("path");
 /**
- * This function add addtional rules to expo's webpack config to make expo web working
+ * This function add additional rules to expo's webpack config to make expo web working
  */
 function withNxWebpack(config) {
     var _a;
@@ -17,7 +17,7 @@ function withNxWebpack(config) {
                 test: /\.(mjs|[jt]sx?)$/,
                 exclude: /node_modules/,
                 use: {
-                    loader: require.resolve('@nrwl/web/src/utils/web-babel-loader.js'),
+                    loader: require.resolve('@nrwl/webpack/src/utils/web-babel-loader.js'),
                     options: {
                         presets: [
                             [
@@ -30,64 +30,12 @@ function withNxWebpack(config) {
                     },
                 },
             });
-            // svg rule from https://github.com/kristerkari/react-native-svg-transformer/issues/135#issuecomment-1008310514
-            rules.unshift({
-                test: /\.svg$/,
-                exclude: /node_modules/,
-                use: [
-                    {
-                        loader: require.resolve('@svgr/webpack'),
-                        options: {
-                            svgoConfig: {
-                                plugins: {
-                                    cleanupAttrs: true,
-                                    cleanupEnableBackground: true,
-                                    cleanupIDs: true,
-                                    cleanupListOfValues: true,
-                                    cleanupNumericValues: true,
-                                    collapseGroups: true,
-                                    convertEllipseToCircle: true,
-                                    convertPathData: true,
-                                    convertShapeToPath: true,
-                                    convertStyleToAttrs: true,
-                                    convertTransform: true,
-                                    inlineStyles: true,
-                                    mergePaths: true,
-                                    minifyStyles: true,
-                                    moveElemsAttrsToGroup: true,
-                                    moveGroupAttrsToElems: true,
-                                    removeComments: true,
-                                    removeDesc: true,
-                                    removeDimensions: false,
-                                    removeDoctype: true,
-                                    removeEditorsNSData: true,
-                                    removeEmptyAttrs: true,
-                                    removeEmptyContainers: true,
-                                    removeEmptyText: true,
-                                    removeHiddenElems: true,
-                                    removeMetadata: true,
-                                    removeNonInheritableGroupAttrs: true,
-                                    removeRasterImages: true,
-                                    removeScriptElement: false,
-                                    removeStyleElement: false,
-                                    removeTitle: true,
-                                    removeUnknownsAndDefaults: true,
-                                    removeUnusedNS: true,
-                                    removeUselessDefs: true,
-                                    removeUselessStrokeAndFill: true,
-                                    removeViewBox: false,
-                                    removeXMLNS: true,
-                                    removeXMLProcInst: true,
-                                    reusePaths: true,
-                                    sortAttrs: true,
-                                    sortDefsChildren: true,
-                                    convertColors: false,
-                                },
-                            },
-                        },
-                    },
-                ],
-            });
+        }
+        if (!config.resolve) {
+            config.resolve = {};
+        }
+        if (!config.resolve.plugins) {
+            config.resolve.plugins = [];
         }
         const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
         const tsConfigPath = (0, path_1.resolve)('tsconfig.json');

package/plugins/with-nx-webpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-nx-webpack.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-webpack.ts"],"names":[],"mappings":";;;;AAAA,iFAAoE;AACpE,+BAA+B;AAE/B;;GAEG;AACH,SAAsB,aAAa,CAAC,MAAM;;;QACxC,+CAA+C;QAC/C,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC;QAC5C,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,cAAc;gBACvB,GAAG,EAAE;oBACH,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,yCAAyC,CAAC;oBAClE,OAAO,EAAE;wBACP,OAAO,EAAE;4BACP;gCACE,mBAAmB;gCACnB;oCACE,OAAO,EAAE,WAAW;iCACrB;6BACF;yBACF;qBACF;iBACF;aACF,CAAC,CAAC;YACH,+GAA+G;YAC/G,KAAK,CAAC,OAAO,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,cAAc;gBACvB,GAAG,EAAE;oBACH;wBACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;wBACxC,OAAO,EAAE;4BACP,UAAU,EAAE;gCACV,OAAO,EAAE;oCACP,YAAY,EAAE,IAAI;oCAClB,uBAAuB,EAAE,IAAI;oCAC7B,UAAU,EAAE,IAAI;oCAChB,mBAAmB,EAAE,IAAI;oCACzB,oBAAoB,EAAE,IAAI;oCAC1B,cAAc,EAAE,IAAI;oCACpB,sBAAsB,EAAE,IAAI;oCAC5B,eAAe,EAAE,IAAI;oCACrB,kBAAkB,EAAE,IAAI;oCACxB,mBAAmB,EAAE,IAAI;oCACzB,gBAAgB,EAAE,IAAI;oCACtB,YAAY,EAAE,IAAI;oCAClB,UAAU,EAAE,IAAI;oCAChB,YAAY,EAAE,IAAI;oCAClB,qBAAqB,EAAE,IAAI;oCAC3B,qBAAqB,EAAE,IAAI;oCAC3B,cAAc,EAAE,IAAI;oCACpB,UAAU,EAAE,IAAI;oCAChB,gBAAgB,EAAE,KAAK;oCACvB,aAAa,EAAE,IAAI;oCACnB,mBAAmB,EAAE,IAAI;oCACzB,gBAAgB,EAAE,IAAI;oCACtB,qBAAqB,EAAE,IAAI;oCAC3B,eAAe,EAAE,IAAI;oCACrB,iBAAiB,EAAE,IAAI;oCACvB,cAAc,EAAE,IAAI;oCACpB,8BAA8B,EAAE,IAAI;oCACpC,kBAAkB,EAAE,IAAI;oCACxB,mBAAmB,EAAE,KAAK;oCAC1B,kBAAkB,EAAE,KAAK;oCACzB,WAAW,EAAE,IAAI;oCACjB,yBAAyB,EAAE,IAAI;oCAC/B,cAAc,EAAE,IAAI;oCACpB,iBAAiB,EAAE,IAAI;oCACvB,0BAA0B,EAAE,IAAI;oCAChC,aAAa,EAAE,KAAK;oCACpB,WAAW,EAAE,IAAI;oCACjB,iBAAiB,EAAE,IAAI;oCACvB,UAAU,EAAE,IAAI;oCAChB,SAAS,EAAE,IAAI;oCACf,gBAAgB,EAAE,IAAI;oCACtB,aAAa,EAAE,KAAK;iCACrB;6BACF;yBACF;qBACF;iBACF;aACF,CAAC,CAAC;SACJ;QAED,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QAE9C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CACzB,IAAI,mDAAmB,CAAC;YACtB,UAAU,EAAE,YAAY;YACxB,UAAU;SACX,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC/B,OAAO,MAAM,CAAC;;CACf;AA7FD,sCA6FC"}
+{"version":3,"file":"with-nx-webpack.js","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-webpack.ts"],"names":[],"mappings":";;;;AAAA,iFAAoE;AACpE,+BAA+B;AAE/B;;GAEG;AACH,SAAsB,aAAa,CAAC,MAAM;;;QACxC,+CAA+C;QAC/C,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC;QAC5C,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,cAAc;gBACvB,GAAG,EAAE;oBACH,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,6CAA6C,CAAC;oBACtE,OAAO,EAAE;wBACP,OAAO,EAAE;4BACP;gCACE,mBAAmB;gCACnB;oCACE,OAAO,EAAE,WAAW;iCACrB;6BACF;yBACF;qBACF;iBACF;aACF,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;SACrB;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;SAC7B;QAED,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QAE9C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CACzB,IAAI,mDAAmB,CAAC;YACtB,UAAU,EAAE,YAAY;YACxB,UAAU;SACX,CAAC,CACH,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC/B,OAAO,MAAM,CAAC;;CACf;AA1CD,sCA0CC"}