@nx/expo 16.0.0-beta.6 → 16.0.0-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. package/docs/run-examples.md +1 -1
  2. package/migrations.json +34 -0
  3. package/package.json +11 -11
  4. package/src/generators/application/files/eas.json.template +1 -1
  5. package/src/generators/application/lib/create-application-files.js +3 -1
  6. package/src/generators/application/lib/create-application-files.js.map +1 -1
  7. package/src/generators/component/files/__fileName__.spec.tsx.template +2 -2
  8. package/src/generators/init/init.js +1 -0
  9. package/src/generators/init/init.js.map +1 -1
  10. package/src/migrations/update-16-0-0/add-jest-expo.d.ts +6 -0
  11. package/src/migrations/update-16-0-0/add-jest-expo.js +31 -0
  12. package/src/migrations/update-16-0-0/add-jest-expo.js.map +1 -0
  13. package/src/utils/add-jest.js +1 -1
  14. package/src/utils/add-linting.js +1 -0
  15. package/src/utils/add-linting.js.map +1 -1
  16. package/src/utils/pod-install-task.d.ts +2 -2
  17. package/src/utils/pod-install-task.js +30 -12
  18. package/src/utils/pod-install-task.js.map +1 -1
  19. package/src/utils/versions.d.ts +8 -7
  20. package/src/utils/versions.js +9 -8
  21. package/src/utils/versions.js.map +1 -1
package/docs/run-examples.md CHANGED
@@ -65,7 +65,7 @@ The `xcodeConfiguration` option allows you to specify Xcode configuration to use
65
65
  {% tab label="Run on a device" %}
66
66
 
67
67
  The `device` option allows you to launch your app in a specific device name or UDID.
68
- To see all your iOS simulators: run `xcrun simctl list`.
68
+ To see all your iOS simulators: run `xcrun simctl list devices available`.
69
69
  To see all your Android emulators, run: `emulator -list-avds`.
70
70
 
71
71
  ```json
package/migrations.json CHANGED
@@ -729,6 +729,40 @@
729
729
  "alwaysAddToPackageJson": false
730
730
  }
731
731
  }
732
+ },
733
+ "16.0.0": {
734
+ "version": "16.0.0-beta.0",
735
+ "packages": {
736
+ "expo": {
737
+ "version": "48.0.11",
738
+ "alwaysAddToPackageJson": false
739
+ },
740
+ "react-native": {
741
+ "version": "0.71.6",
742
+ "alwaysAddToPackageJson": false
743
+ },
744
+ "@types/react-native": {
745
+ "version": "0.71.6",
746
+ "alwaysAddToPackageJson": false
747
+ },
748
+ "eas-cli": {
749
+ "version": "~3.10.0",
750
+ "alwaysAddToPackageJson": false
751
+ },
752
+ "@expo/cli": {
753
+ "version": "~0.7.0",
754
+ "alwaysAddToPackageJson": false
755
+ },
756
+ "@testing-library/react-native": {
757
+ "version": "12.0.1",
758
+ "alwaysAddToPackageJson": false
759
+ },
760
+ "jest-expo": {
761
+ "version": "48.0.0",
762
+ "alwaysAddToPackageJson": false,
763
+ "addToPackageJson": "devDependencies"
764
+ }
765
+ }
732
766
  }
733
767
  }
734
768
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/expo",
3
- "version": "16.0.0-beta.6",
3
+ "version": "16.0.0-beta.8",
4
4
  "private": false,
5
5
  "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.",
6
6
  "keywords": [
@@ -26,14 +26,14 @@
26
26
  "main": "./index",
27
27
  "types": "index.d.ts",
28
28
  "dependencies": {
29
- "@nrwl/expo": "16.0.0-beta.6",
30
- "@nx/detox": "16.0.0-beta.6",
31
- "@nx/devkit": "16.0.0-beta.6",
32
- "@nx/jest": "16.0.0-beta.6",
33
- "@nx/js": "16.0.0-beta.6",
34
- "@nx/linter": "16.0.0-beta.6",
35
- "@nx/react": "16.0.0-beta.6",
36
- "@nx/webpack": "16.0.0-beta.6",
29
+ "@nrwl/expo": "16.0.0-beta.8",
30
+ "@nx/detox": "16.0.0-beta.8",
31
+ "@nx/devkit": "16.0.0-beta.8",
32
+ "@nx/jest": "16.0.0-beta.8",
33
+ "@nx/js": "16.0.0-beta.8",
34
+ "@nx/linter": "16.0.0-beta.8",
35
+ "@nx/react": "16.0.0-beta.8",
36
+ "@nx/webpack": "16.0.0-beta.8",
37
37
  "chalk": "^4.1.0",
38
38
  "enhanced-resolve": "^5.8.3",
39
39
  "fs-extra": "^11.1.0",
@@ -44,7 +44,7 @@
44
44
  "tsconfig-paths-webpack-plugin": "^4.0.0"
45
45
  },
46
46
  "peerDependencies": {
47
- "expo": "^48.0.6"
47
+ "expo": "^48.0.11"
48
48
  },
49
49
  "builders": "./executors.json",
50
50
  "ng-update": {
@@ -55,5 +55,5 @@
55
55
  "publishConfig": {
56
56
  "access": "public"
57
57
  },
58
- "gitHead": "b719222d42a4e11bcdd537ef818c2bea130112f8"
58
+ "gitHead": "200cf327337f17cea009d83e9055a628346b4084"
59
59
  }
package/src/generators/application/files/eas.json.template CHANGED
@@ -23,6 +23,6 @@
23
23
  "production": {}
24
24
  },
25
25
  "cli": {
26
- "version": ">= 0.55.1"
26
+ "version": "<%= easCliVersion %>"
27
27
  }
28
28
  }
package/src/generators/application/lib/create-application-files.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createApplicationFiles = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const path_1 = require("path");
6
+ const versions_1 = require("../../../utils/versions");
6
7
  function createApplicationFiles(host, options) {
7
8
  const packageManagerLockFile = {
8
9
  npm: 'package-lock.json',
@@ -12,7 +13,8 @@ function createApplicationFiles(host, options) {
12
13
  const packageManager = (0, devkit_1.detectPackageManager)(host.root);
13
14
  const packageLockFile = packageManagerLockFile[packageManager];
14
15
  (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files'), options.appProjectRoot, Object.assign(Object.assign({}, options), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), packageManager,
15
- packageLockFile }));
16
+ packageLockFile,
17
+ easCliVersion: versions_1.easCliVersion }));
16
18
  if (options.unitTestRunner === 'none') {
17
19
  host.delete((0, path_1.join)(options.appProjectRoot, `App.spec.tsx`));
18
20
  }
package/src/generators/application/lib/create-application-files.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,+BAA4B;AAG5B,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,MAAM,sBAAsB,GAAmC;QAC7D,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,gBAAgB;KACvB,CAAC;IACF,MAAM,cAAc,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAC/D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,cAAc,kCAClE,OAAO,KACV,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,EACtD,cAAc;QACd,eAAe,IACf,CAAC;IACH,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC;KAC3D;IACD,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;AACH,CAAC;AApBD,wDAoBC"}
1
+ {"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,+BAA4B;AAC5B,sDAAwD;AAGxD,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,MAAM,sBAAsB,GAAmC;QAC7D,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,gBAAgB;KACvB,CAAC;IACF,MAAM,cAAc,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAC/D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,cAAc,kCAClE,OAAO,KACV,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,EACtD,cAAc;QACd,eAAe;QACf,aAAa,EAAb,wBAAa,IACb,CAAC;IACH,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC;KAC3D;IACD,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;AACH,CAAC;AArBD,wDAqBC"}
package/src/generators/component/files/__fileName__.spec.tsx.template CHANGED
@@ -5,7 +5,7 @@ import <%= className %> from './<%= fileName %>';
5
5
 
6
6
  describe('<%= className %>', () => {
7
7
  it('should render successfully', () => {
8
- const { container } = render(< <%= className %> />);
9
- expect(container).toBeTruthy();
8
+ const { root } = render(< <%= className %> />);
9
+ expect(root).toBeTruthy();
10
10
  });
11
11
  });
package/src/generators/init/init.js CHANGED
@@ -55,6 +55,7 @@ function updateDependencies(host) {
55
55
  'react-test-renderer': versions_1.reactTestRendererVersion,
56
56
  '@testing-library/react-native': versions_1.testingLibraryReactNativeVersion,
57
57
  '@testing-library/jest-native': versions_1.testingLibraryJestNativeVersion,
58
+ 'jest-expo': versions_1.jestExpoVersion,
58
59
  '@expo/cli': versions_1.expoCliVersion,
59
60
  'eas-cli': versions_1.easCliVersion,
60
61
  'babel-preset-expo': versions_1.babelPresetExpoVersion,
package/src/generators/init/init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AAEpB,mDAqB8B;AAE9B,mCAA6C;AAC7C,qCAA+C;AAC/C,+BAA0D;AAE1D,qEAA+D;AAC/D,yEAAmE;AAEnE,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAc;;QAChE,IAAA,wCAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,IAAA,4CAAmB,EAAC,IAAI,CAAC,CAAC;QAE1B,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACrB,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAC3B,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;SACtC;QAED,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,OAAO,EAAE;YAC7D,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAkB,EAAC,IAAI,kCAC1C,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACvB;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AApCD,8CAoCC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,cAAc,EAAE,6BAAkB;QAClC,IAAI,EAAE,sBAAW;QACjB,oBAAoB,EAAE,kCAAuB;QAC7C,iBAAiB,EAAE,+BAAoB;QACvC,kBAAkB,EAAE,gCAAqB;QACzC,oBAAoB,EAAE,iCAAsB;QAC5C,8BAA8B,EAAE,2CAAgC;QAChE,kBAAkB,EAAE,gCAAqB;KAC1C,EACD;QACE,UAAU,EAAE,oBAAS;QACrB,cAAc,EAAE,4BAAiB;QACjC,qBAAqB,EAAE,kCAAuB;QAC9C,KAAK,EAAE,uBAAY;QACnB,gBAAgB,EAAE,uBAAY;QAC9B,qBAAqB,EAAE,mCAAwB;QAC/C,+BAA+B,EAAE,2CAAgC;QACjE,8BAA8B,EAAE,0CAA+B;QAC/D,WAAW,EAAE,yBAAc;QAC3B,SAAS,EAAE,wBAAa;QACxB,mBAAmB,EAAE,iCAAsB;KAC5C,CACF,CAAC;AACJ,CAAC;AA7BD,gDA6BC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,OAAO,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AAEpB,mDAsB8B;AAE9B,mCAA6C;AAC7C,qCAA+C;AAC/C,+BAA0D;AAE1D,qEAA+D;AAC/D,yEAAmE;AAEnE,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAc;;QAChE,IAAA,wCAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,IAAA,4CAAmB,EAAC,IAAI,CAAC,CAAC;QAE1B,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACrB,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAC3B,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;SACtC;QAED,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QAED,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,OAAO,EAAE;YAC7D,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAkB,EAAC,IAAI,kCAC1C,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACvB;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AApCD,8CAoCC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,cAAc,EAAE,6BAAkB;QAClC,IAAI,EAAE,sBAAW;QACjB,oBAAoB,EAAE,kCAAuB;QAC7C,iBAAiB,EAAE,+BAAoB;QACvC,kBAAkB,EAAE,gCAAqB;QACzC,oBAAoB,EAAE,iCAAsB;QAC5C,8BAA8B,EAAE,2CAAgC;QAChE,kBAAkB,EAAE,gCAAqB;KAC1C,EACD;QACE,UAAU,EAAE,oBAAS;QACrB,cAAc,EAAE,4BAAiB;QACjC,qBAAqB,EAAE,kCAAuB;QAC9C,KAAK,EAAE,uBAAY;QACnB,gBAAgB,EAAE,uBAAY;QAC9B,qBAAqB,EAAE,mCAAwB;QAC/C,+BAA+B,EAAE,2CAAgC;QACjE,8BAA8B,EAAE,0CAA+B;QAC/D,WAAW,EAAE,0BAAe;QAC5B,WAAW,EAAE,yBAAc;QAC3B,SAAS,EAAE,wBAAa;QACxB,mBAAmB,EAAE,iCAAsB;KAC5C,CACF,CAAC;AACJ,CAAC;AA9BD,gDA8BC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,OAAO,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
package/src/migrations/update-16-0-0/add-jest-expo.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ import { Tree } from '@nx/devkit';
2
+ /**
3
+ * Change the preset in expo's jest config
4
+ * - changes preset of jest.config to jest-expo
5
+ */
6
+ export default function update(tree: Tree): Promise<void>;
package/src/migrations/update-16-0-0/add-jest-expo.js ADDED
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ const devkit_1 = require("@nx/devkit");
5
+ const jest_1 = require("@nx/jest");
6
+ /**
7
+ * Change the preset in expo's jest config
8
+ * - changes preset of jest.config to jest-expo
9
+ */
10
+ function update(tree) {
11
+ var _a, _b, _c, _d, _e;
12
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
13
+ const projects = (0, devkit_1.getProjects)(tree);
14
+ for (const [name, config] of projects.entries()) {
15
+ if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a['start']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/expo:start') {
16
+ const jestConfigPath = (_e = (_d = (_c = config.targets) === null || _c === void 0 ? void 0 : _c.test) === null || _d === void 0 ? void 0 : _d.options) === null || _e === void 0 ? void 0 : _e.jestConfig;
17
+ if (!jestConfigPath || !tree.exists(jestConfigPath))
18
+ return;
19
+ try {
20
+ (0, jest_1.removePropertyFromJestConfig)(tree, jestConfigPath, 'preset');
21
+ (0, jest_1.addPropertyToJestConfig)(tree, jestConfigPath, 'preset', 'jest-expo');
22
+ }
23
+ catch (_f) {
24
+ devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update ${jestConfigPath} for project ${name}.`);
25
+ }
26
+ }
27
+ }
28
+ });
29
+ }
30
+ exports.default = update;
31
+ //# sourceMappingURL=add-jest-expo.js.map
package/src/migrations/update-16-0-0/add-jest-expo.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"add-jest-expo.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/migrations/update-16-0-0/add-jest-expo.ts"],"names":[],"mappings":";;;AAAA,uCAAqE;AACrE,mCAGkB;AAElB;;;GAGG;AACH,SAA8B,MAAM,CAAC,IAAU;;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YAC/C,IAAI,CAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAG,OAAO,CAAC,0CAAE,QAAQ,MAAK,kBAAkB,EAAE;gBAC9D,MAAM,cAAc,GAAG,MAAA,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,IAAI,0CAAE,OAAO,0CAAE,UAAU,CAAC;gBACjE,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;oBAAE,OAAO;gBAC5D,IAAI;oBACF,IAAA,mCAA4B,EAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;oBAC7D,IAAA,8BAAuB,EAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;iBACtE;gBAAC,WAAM;oBACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,oBAAoB,cAAc,gBAAgB,IAAI,GAAG,CACtE,CAAC;iBACH;aACF;SACF;;CACF;AAjBD,yBAiBC"}
package/src/utils/add-jest.js CHANGED
@@ -21,7 +21,7 @@ function addJest(host, unitTestRunner, projectName, appProjectRoot, js) {
21
21
  const content = `module.exports = {
22
22
  displayName: '${projectName}',
23
23
  resolver: '@nx/jest/plugins/resolver',
24
- preset: 'react-native',
24
+ preset: 'jest-expo',
25
25
  transformIgnorePatterns: [
26
26
  'node_modules/(?!((jest-)?react-native|@react-native(-community)?)|expo(nent)?|@expo(nent)?/.*|@expo-google-fonts/.*|react-navigation|@react-navigation/.*|@unimodules/.*|unimodules|sentry-expo|native-base|react-native-svg)',
27
27
  ],
package/src/utils/add-linting.js CHANGED
@@ -26,6 +26,7 @@ function addLinting(host, projectName, appProjectRoot, tsConfigPaths, linter, se
26
26
  'node_modules',
27
27
  'web-build',
28
28
  'cache',
29
+ 'dist',
29
30
  ];
30
31
  return json;
31
32
  });
package/src/utils/add-linting.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/add-linting.ts"],"names":[],"mappings":";;;;AAAA,uCAA0D;AAC1D,uCAMoB;AACpB,qCAA2E;AAG3E,SAAsB,UAAU,CAC9B,IAAU,EACV,WAAmB,EACnB,cAAsB,EACtB,aAAuB,EACvB,MAAc,EACd,uBAAiC;;QAEjC,IAAI,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAC1B,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM;YACN,OAAO,EAAE,WAAW;YACpB,aAAa;YACb,kBAAkB,EAAE,CAAC,GAAG,cAAc,uBAAuB,CAAC;YAC9D,UAAU,EAAE,IAAI;YAChB,uBAAuB;SACxB,CAAC,CAAC;QAEH,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,gBAAgB,CAAC,EACnD,CAAC,IAAyB,EAAE,EAAE;YAC5B,IAAI,GAAG,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC;YAEnC,IAAI,CAAC,cAAc,GAAG;gBACpB,GAAG,IAAI,CAAC,cAAc;gBACtB,OAAO;gBACP,cAAc;gBACd,WAAW;gBACX,OAAO;aACR,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA4B,EACpD,IAAI,EACJ,+BAAuB,CAAC,YAAY,EACpC,+BAAuB,CAAC,eAAe,CACxC,CAAC;QAEF,OAAO,IAAA,yBAAgB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;CAAA;AA9CD,gCA8CC"}
1
+ {"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/add-linting.ts"],"names":[],"mappings":";;;;AAAA,uCAA0D;AAC1D,uCAMoB;AACpB,qCAA2E;AAG3E,SAAsB,UAAU,CAC9B,IAAU,EACV,WAAmB,EACnB,cAAsB,EACtB,aAAuB,EACvB,MAAc,EACd,uBAAiC;;QAEjC,IAAI,MAAM,KAAK,eAAM,CAAC,IAAI,EAAE;YAC1B,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM;YACN,OAAO,EAAE,WAAW;YACpB,aAAa;YACb,kBAAkB,EAAE,CAAC,GAAG,cAAc,uBAAuB,CAAC;YAC9D,UAAU,EAAE,IAAI;YAChB,uBAAuB;SACxB,CAAC,CAAC;QAEH,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,gBAAgB,CAAC,EACnD,CAAC,IAAyB,EAAE,EAAE;YAC5B,IAAI,GAAG,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC;YAEnC,IAAI,CAAC,cAAc,GAAG;gBACpB,GAAG,IAAI,CAAC,cAAc;gBACtB,OAAO;gBACP,cAAc;gBACd,WAAW;gBACX,OAAO;gBACP,MAAM;aACP,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA4B,EACpD,IAAI,EACJ,+BAAuB,CAAC,YAAY,EACpC,+BAAuB,CAAC,eAAe,CACxC,CAAC;QAEF,OAAO,IAAA,yBAAgB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;CAAA;AA/CD,gCA+CC"}
package/src/utils/pod-install-task.d.ts CHANGED
@@ -4,5 +4,5 @@ import { GeneratorCallback } from '@nx/devkit';
4
4
  * @param iosDirectory ios directory that contains Podfile
5
5
  * @returns resolve with 0 if not error, reject with error otherwise
6
6
  */
7
- export declare function runPodInstall(iosDirectory: string, install?: boolean): GeneratorCallback;
8
- export declare function podInstall(iosDirectory: string): Promise<void>;
7
+ export declare function runPodInstall(iosDirectory: string, install?: boolean, buildFolder?: string): GeneratorCallback;
8
+ export declare function podInstall(iosDirectory: string, buildFolder?: string): Promise<void>;
package/src/utils/pod-install-task.js CHANGED
@@ -5,6 +5,8 @@ const child_process_1 = require("child_process");
5
5
  const os_1 = require("os");
6
6
  const chalk = require("chalk");
7
7
  const devkit_1 = require("@nx/devkit");
8
+ const fs_extra_1 = require("fs-extra");
9
+ const path_1 = require("path");
8
10
  const podInstallErrorMessage = `
9
11
  Running ${chalk.bold('pod install')} failed, see above.
10
12
  Do you have CocoaPods (https://cocoapods.org/) installed?
@@ -20,33 +22,49 @@ ${chalk.bold('sudo xcode-select --switch /Applications/Xcode.app')}
20
22
  * @param iosDirectory ios directory that contains Podfile
21
23
  * @returns resolve with 0 if not error, reject with error otherwise
22
24
  */
23
- function runPodInstall(iosDirectory, install = true) {
25
+ function runPodInstall(iosDirectory, install = true, buildFolder) {
24
26
  return () => {
25
27
  if ((0, os_1.platform)() !== 'darwin') {
26
28
  devkit_1.logger.info('Skipping `pod install` on non-darwin platform');
27
29
  return;
28
30
  }
29
- if (!install) {
31
+ if (!install || (0, fs_extra_1.existsSync)((0, path_1.join)(iosDirectory, 'Podfile'))) {
30
32
  devkit_1.logger.info('Skipping `pod install`');
31
33
  return;
32
34
  }
33
35
  devkit_1.logger.info(`Running \`pod install\` from "${iosDirectory}"`);
34
- return podInstall(iosDirectory);
36
+ return podInstall(iosDirectory, buildFolder);
35
37
  };
36
38
  }
37
39
  exports.runPodInstall = runPodInstall;
38
- function podInstall(iosDirectory) {
40
+ function podInstall(iosDirectory, buildFolder) {
39
41
  return new Promise((resolve, reject) => {
40
- const result = (0, child_process_1.execSync)('pod install', {
42
+ (0, child_process_1.exec)('pod install', {
41
43
  cwd: iosDirectory,
44
+ }, (error, stdout, stderr) => {
45
+ if (error) {
46
+ devkit_1.logger.error(error.message);
47
+ reject(new Error(podInstallErrorMessage));
48
+ }
49
+ if (stderr) {
50
+ devkit_1.logger.error(stderr);
51
+ reject(new Error(podInstallErrorMessage));
52
+ }
53
+ devkit_1.logger.info(stdout);
54
+ if (stdout.includes('Pod installation complete')) {
55
+ // Remove build folder after pod install
56
+ if (buildFolder) {
57
+ buildFolder = (0, path_1.join)(iosDirectory, buildFolder);
58
+ if ((0, fs_extra_1.existsSync)(buildFolder)) {
59
+ (0, fs_extra_1.rmdirSync)(buildFolder, { recursive: true });
60
+ }
61
+ }
62
+ resolve();
63
+ }
64
+ else {
65
+ reject(new Error(podInstallErrorMessage));
66
+ }
42
67
  });
43
- devkit_1.logger.info(result.toString());
44
- if (result.toString().includes('Pod installation complete')) {
45
- resolve();
46
- }
47
- else {
48
- reject(new Error(podInstallErrorMessage));
49
- }
50
68
  });
51
69
  }
52
70
  exports.podInstall = podInstall;
package/src/utils/pod-install-task.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pod-install-task.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/pod-install-task.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,2BAA8B;AAC9B,+BAA+B;AAC/B,uCAAuD;AAEvD,MAAM,sBAAsB,GAAG;UACrB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;;;;EAIjC,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC;;;EAG5C,KAAK,CAAC,IAAI,CAAC,oDAAoD,CAAC;CACjE,CAAC;AAEF;;;;GAIG;AACH,SAAgB,aAAa,CAC3B,YAAoB,EACpB,UAAmB,IAAI;IAEvB,OAAO,GAAG,EAAE;QACV,IAAI,IAAA,aAAQ,GAAE,KAAK,QAAQ,EAAE;YAC3B,eAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YAC7D,OAAO;SACR;QAED,IAAI,CAAC,OAAO,EAAE;YACZ,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACtC,OAAO;SACR;QAED,eAAM,CAAC,IAAI,CAAC,iCAAiC,YAAY,GAAG,CAAC,CAAC;QAE9D,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC,CAAC;AACJ,CAAC;AAnBD,sCAmBC;AAED,SAAgB,UAAU,CAAC,YAAoB;IAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,aAAa,EAAE;YACrC,GAAG,EAAE,YAAY;SAClB,CAAC,CAAC;QACH,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/B,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE;YAC3D,OAAO,EAAE,CAAC;SACX;aAAM;YACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;SAC3C;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,gCAYC"}
1
+ {"version":3,"file":"pod-install-task.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/pod-install-task.ts"],"names":[],"mappings":";;;AAAA,iDAAqC;AACrC,2BAA8B;AAC9B,+BAA+B;AAC/B,uCAAuD;AACvD,uCAAiD;AACjD,+BAA4B;AAE5B,MAAM,sBAAsB,GAAG;UACrB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;;;;EAIjC,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC;;;EAG5C,KAAK,CAAC,IAAI,CAAC,oDAAoD,CAAC;CACjE,CAAC;AAEF;;;;GAIG;AACH,SAAgB,aAAa,CAC3B,YAAoB,EACpB,UAAmB,IAAI,EACvB,WAAoB;IAEpB,OAAO,GAAG,EAAE;QACV,IAAI,IAAA,aAAQ,GAAE,KAAK,QAAQ,EAAE;YAC3B,eAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YAC7D,OAAO;SACR;QAED,IAAI,CAAC,OAAO,IAAI,IAAA,qBAAU,EAAC,IAAA,WAAI,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC,EAAE;YACzD,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACtC,OAAO;SACR;QAED,eAAM,CAAC,IAAI,CAAC,iCAAiC,YAAY,GAAG,CAAC,CAAC;QAE9D,OAAO,UAAU,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC/C,CAAC,CAAC;AACJ,CAAC;AApBD,sCAoBC;AAED,SAAgB,UAAU,CACxB,YAAoB,EACpB,WAAoB;IAEpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAA,oBAAI,EACF,aAAa,EACb;YACE,GAAG,EAAE,YAAY;SAClB,EACD,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACxB,IAAI,KAAK,EAAE;gBACT,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC5B,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;aAC3C;YACD,IAAI,MAAM,EAAE;gBACV,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACrB,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;aAC3C;YACD,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,IAAI,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EAAE;gBAChD,wCAAwC;gBACxC,IAAI,WAAW,EAAE;oBACf,WAAW,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC;oBAC9C,IAAI,IAAA,qBAAU,EAAC,WAAW,CAAC,EAAE;wBAC3B,IAAA,oBAAS,EAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC7C;iBACF;gBACD,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAnCD,gCAmCC"}
package/src/utils/versions.d.ts CHANGED
@@ -1,20 +1,21 @@
1
1
  export declare const nxVersion: any;
2
- export declare const expoVersion = "48.0.6";
2
+ export declare const expoVersion = "48.0.11";
3
3
  export declare const expoMetroConfigVersion = "0.7.1";
4
4
  export declare const expoSplashScreenVersion = "~0.18.1";
5
5
  export declare const expoStatusBarVersion = "~1.4.4";
6
- export declare const expoCliVersion = "0.6.2";
7
- export declare const easCliVersion = "3.7.2";
8
- export declare const babelPresetExpoVersion = "~9.3.0";
6
+ export declare const expoCliVersion = "~0.7.0";
7
+ export declare const easCliVersion = "~3.10.0";
8
+ export declare const babelPresetExpoVersion = "~9.3.2";
9
9
  export declare const reactVersion = "18.2.0";
10
10
  export declare const reactDomVersion = "18.2.0";
11
11
  export declare const reactTestRendererVersion = "18.2.0";
12
12
  export declare const typesReactVersion = "18.0.28";
13
- export declare const reactNativeVersion = "0.71.4";
14
- export declare const typesReactNativeVersion = "0.71.4";
13
+ export declare const reactNativeVersion = "0.71.6";
14
+ export declare const typesReactNativeVersion = "0.71.6";
15
15
  export declare const reactNativeWebVersion = "~0.18.12";
16
16
  export declare const reactNativeSvgTransformerVersion = "1.0.0";
17
17
  export declare const reactNativeSvgVersion = "13.4.0";
18
18
  export declare const metroVersion = "0.74.1";
19
- export declare const testingLibraryReactNativeVersion = "11.5.2";
19
+ export declare const testingLibraryReactNativeVersion = "12.0.1";
20
20
  export declare const testingLibraryJestNativeVersion = "5.4.2";
21
+ export declare const jestExpoVersion = "~48.0.2";
package/src/utils/versions.js CHANGED
@@ -1,24 +1,25 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.metroVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.reactNativeWebVersion = exports.typesReactNativeVersion = exports.reactNativeVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.babelPresetExpoVersion = exports.easCliVersion = exports.expoCliVersion = exports.expoStatusBarVersion = exports.expoSplashScreenVersion = exports.expoMetroConfigVersion = exports.expoVersion = exports.nxVersion = void 0;
3
+ exports.jestExpoVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.metroVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.reactNativeWebVersion = exports.typesReactNativeVersion = exports.reactNativeVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.babelPresetExpoVersion = exports.easCliVersion = exports.expoCliVersion = exports.expoStatusBarVersion = exports.expoSplashScreenVersion = exports.expoMetroConfigVersion = exports.expoVersion = exports.nxVersion = void 0;
4
4
  exports.nxVersion = require('../../package.json').version;
5
- exports.expoVersion = '48.0.6';
5
+ exports.expoVersion = '48.0.11';
6
6
  exports.expoMetroConfigVersion = '0.7.1';
7
7
  exports.expoSplashScreenVersion = '~0.18.1';
8
8
  exports.expoStatusBarVersion = '~1.4.4';
9
- exports.expoCliVersion = '0.6.2'; // @expo/cli
10
- exports.easCliVersion = '3.7.2';
11
- exports.babelPresetExpoVersion = '~9.3.0';
9
+ exports.expoCliVersion = '~0.7.0'; // @expo/cli
10
+ exports.easCliVersion = '~3.10.0';
11
+ exports.babelPresetExpoVersion = '~9.3.2';
12
12
  exports.reactVersion = '18.2.0';
13
13
  exports.reactDomVersion = '18.2.0';
14
14
  exports.reactTestRendererVersion = '18.2.0';
15
15
  exports.typesReactVersion = '18.0.28';
16
- exports.reactNativeVersion = '0.71.4';
17
- exports.typesReactNativeVersion = '0.71.4';
16
+ exports.reactNativeVersion = '0.71.6';
17
+ exports.typesReactNativeVersion = '0.71.6';
18
18
  exports.reactNativeWebVersion = '~0.18.12';
19
19
  exports.reactNativeSvgTransformerVersion = '1.0.0';
20
20
  exports.reactNativeSvgVersion = '13.4.0';
21
21
  exports.metroVersion = '0.74.1';
22
- exports.testingLibraryReactNativeVersion = '11.5.2';
22
+ exports.testingLibraryReactNativeVersion = '12.0.1';
23
23
  exports.testingLibraryJestNativeVersion = '5.4.2';
24
+ exports.jestExpoVersion = '~48.0.2';
24
25
  //# sourceMappingURL=versions.js.map
package/src/utils/versions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,sBAAsB,GAAG,OAAO,CAAC;AACjC,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,cAAc,GAAG,OAAO,CAAC,CAAC,YAAY;AACtC,QAAA,aAAa,GAAG,OAAO,CAAC;AACxB,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAElC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE9B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,qBAAqB,GAAG,UAAU,CAAC;AAEnC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAEjC,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,gCAAgC,GAAG,QAAQ,CAAC;AAC5C,QAAA,+BAA+B,GAAG,OAAO,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/expo/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,sBAAsB,GAAG,OAAO,CAAC;AACjC,QAAA,uBAAuB,GAAG,SAAS,CAAC;AACpC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,cAAc,GAAG,QAAQ,CAAC,CAAC,YAAY;AACvC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAElC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE9B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,qBAAqB,GAAG,UAAU,CAAC;AAEnC,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAEjC,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,gCAAgC,GAAG,QAAQ,CAAC;AAC5C,QAAA,+BAA+B,GAAG,OAAO,CAAC;AAC1C,QAAA,eAAe,GAAG,SAAS,CAAC"}