@nrwl/react-native 13.2.2 → 13.3.0-beta.12

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 (78) hide show
  1. package/package.json +8 -7
  2. package/plugins/metro-resolver.js +93 -25
  3. package/plugins/metro-resolver.js.map +1 -1
  4. package/plugins/with-nx-metro.js +1 -1
  5. package/plugins/with-nx-metro.js.map +1 -1
  6. package/project.json +1 -3
  7. package/src/executors/build-android/build-android.impl.js +3 -3
  8. package/src/executors/build-android/build-android.impl.js.map +1 -1
  9. package/src/executors/build-android/build-android.impl.ts +7 -3
  10. package/src/executors/bundle/bundle.impl.js +3 -7
  11. package/src/executors/bundle/bundle.impl.js.map +1 -1
  12. package/src/executors/bundle/bundle.impl.ts +3 -7
  13. package/src/executors/run-android/run-android.impl.js +10 -7
  14. package/src/executors/run-android/run-android.impl.js.map +1 -1
  15. package/src/executors/run-android/run-android.impl.ts +10 -7
  16. package/src/executors/run-android/schema.d.ts +1 -0
  17. package/src/executors/run-android/schema.json +5 -0
  18. package/src/executors/run-ios/run-ios.impl.js +9 -6
  19. package/src/executors/run-ios/run-ios.impl.js.map +1 -1
  20. package/src/executors/run-ios/run-ios.impl.ts +9 -6
  21. package/src/executors/run-ios/schema.d.ts +1 -0
  22. package/src/executors/run-ios/schema.json +5 -0
  23. package/src/executors/start/start.impl.js +1 -1
  24. package/src/executors/start/start.impl.js.map +1 -1
  25. package/src/executors/start/start.impl.ts +1 -1
  26. package/src/executors/sync-deps/sync-deps.impl.d.ts +1 -1
  27. package/src/executors/sync-deps/sync-deps.impl.js +3 -3
  28. package/src/executors/sync-deps/sync-deps.impl.js.map +1 -1
  29. package/src/executors/sync-deps/sync-deps.impl.ts +8 -2
  30. package/src/generators/application/application.js +5 -5
  31. package/src/generators/application/application.js.map +1 -1
  32. package/src/generators/application/files/app/android/app/build.gradle.template +1 -1
  33. package/src/generators/application/files/app/ios/__className__.xcodeproj/project.pbxproj.template +1 -1
  34. package/src/generators/application/files/app/src/app/App.tsx.template +427 -106
  35. package/src/generators/application/files/app/src/app/icons/blog.svg +1 -0
  36. package/src/generators/application/files/app/src/app/icons/book.svg +1 -0
  37. package/src/generators/application/files/app/src/app/icons/checkmark.svg +1 -0
  38. package/src/generators/application/files/app/src/app/icons/chevron-right.svg +1 -0
  39. package/src/generators/application/files/app/src/app/icons/courses.svg +1 -0
  40. package/src/generators/application/files/app/src/app/icons/github.svg +1 -0
  41. package/src/generators/application/files/app/src/app/icons/heart.svg +1 -0
  42. package/src/generators/application/files/app/src/app/{logo.png → icons/logo.png} +0 -0
  43. package/src/generators/application/files/app/src/app/icons/nx-cloud.svg +1 -0
  44. package/src/generators/application/files/app/src/app/icons/pointer.svg +1 -0
  45. package/src/generators/application/files/app/src/app/icons/terminal.svg +1 -0
  46. package/src/generators/application/files/app/src/app/icons/vscode.svg +1 -0
  47. package/src/generators/application/files/app/src/app/icons/youtube.svg +1 -0
  48. package/src/generators/application/lib/add-project.js +2 -2
  49. package/src/generators/application/lib/add-project.js.map +1 -1
  50. package/src/generators/application/lib/nomalize-options.spec.ts +10 -5
  51. package/src/generators/application/lib/normalize-options.d.ts +1 -0
  52. package/src/generators/application/lib/normalize-options.js +4 -2
  53. package/src/generators/application/lib/normalize-options.js.map +1 -1
  54. package/src/generators/init/init.js +7 -17
  55. package/src/generators/init/init.js.map +1 -1
  56. package/src/generators/library/library.js +2 -2
  57. package/src/generators/library/library.js.map +1 -1
  58. package/src/generators/library/library.spec.ts +1 -1
  59. package/src/migrations/update-12-5-0/update-jest-for-react-native.js +9 -3
  60. package/src/migrations/update-12-5-0/update-jest-for-react-native.js.map +1 -1
  61. package/src/utils/add-jest.d.ts +1 -1
  62. package/src/utils/add-jest.js +2 -2
  63. package/src/utils/add-jest.js.map +1 -1
  64. package/src/utils/add-linting.js +6 -18
  65. package/src/utils/add-linting.js.map +1 -1
  66. package/src/utils/ensure-node-modules-symlink.js +1 -82
  67. package/src/utils/ensure-node-modules-symlink.js.map +1 -1
  68. package/src/utils/ensure-node-modules-symlink.spec.ts +8 -86
  69. package/src/utils/pod-install-task.d.ts +4 -4
  70. package/src/utils/pod-install-task.js +7 -7
  71. package/src/utils/pod-install-task.js.map +1 -1
  72. package/src/utils/symlink-task.d.ts +1 -1
  73. package/src/utils/symlink-task.js +2 -3
  74. package/src/utils/symlink-task.js.map +1 -1
  75. package/src/utils/versions.d.ts +1 -0
  76. package/src/utils/versions.js +3 -2
  77. package/src/utils/versions.js.map +1 -1
  78. package/src/generators/application/files/app/src/app/star.svg +0 -11
@@ -1 +1 @@
1
- {"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAGtB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,MAAM;QAC3C,WAAW,EAAE,aAAa;QAC1B,OAAO,oBAAO,UAAU,CAAC,OAAO,CAAC,CAAE;QACnC,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,oBAC5C,OAAO,EACV,CAAC;IAEH,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC7B,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;QAE/C,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC/C;AACH,CAAC;AApBD,gCAoBC;AAED,SAAS,UAAU,CAAC,OAAyB;IAC3C,MAAM,SAAS,GAA2C,EAAE,CAAC;IAE7D,SAAS,CAAC,KAAK,GAAG;QAChB,QAAQ,EAAE,0BAA0B;QACpC,OAAO,EAAE;YACP,IAAI,EAAE,IAAI;SACX;KACF,CAAC;IAEF,SAAS,CAAC,KAAK,GAAG;QAChB,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE;YACP,OAAO,EAAE,YAAY,OAAO,CAAC,IAAI,EAAE;SACpC;KACF,CAAC;IAEF,SAAS,CAAC,SAAS,CAAC,GAAG;QACrB,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,YAAY,CAAC,GAAG;QACxB,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,QAAQ,CAAC;QAC5C,OAAO,EAAE;YACP,SAAS,EAAE,GAAG,OAAO,CAAC,cAAc,eAAe;YACnD,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,QAAQ,OAAO,CAAC,cAAc,oBAAoB;SACjE;KACF,CAAC;IAEF,SAAS,CAAC,aAAa,CAAC,GAAG;QACzB,QAAQ,EAAE,gCAAgC;QAC1C,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,eAAe,CAAC,GAAG;QAC3B,QAAQ,EAAE,kCAAkC;QAC5C,OAAO,EAAE;YACP,GAAG,OAAO,CAAC,cAAc,mCAAmC;YAC5D,GAAG,OAAO,CAAC,cAAc,gCAAgC;SAC1D;QACD,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,GAAG;QAC5B,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,SAAS,EAAE,GAAG,OAAO,CAAC,cAAc,eAAe;YACnD,QAAQ,EAAE,SAAS;YACnB,YAAY,EAAE,QAAQ,OAAO,CAAC,cAAc,wBAAwB;SACrE;KACF,CAAC;IAEF,SAAS,CAAC,WAAW,CAAC,GAAG;QACvB,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,GAAG;QAC5B,QAAQ,EAAE,mCAAmC;QAC7C,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAGtB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,MAAM;QAC3C,WAAW,EAAE,aAAa;QAC1B,OAAO,oBAAO,UAAU,CAAC,OAAO,CAAC,CAAE;QACnC,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,oBAC5C,OAAO,EACV,CAAC;IAEH,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC7B,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;QAE/C,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC/C;AACH,CAAC;AApBD,gCAoBC;AAED,SAAS,UAAU,CAAC,OAAyB;IAC3C,MAAM,SAAS,GAA2C,EAAE,CAAC;IAE7D,SAAS,CAAC,KAAK,GAAG;QAChB,QAAQ,EAAE,0BAA0B;QACpC,OAAO,EAAE;YACP,IAAI,EAAE,IAAI;SACX;KACF,CAAC;IAEF,SAAS,CAAC,KAAK,GAAG;QAChB,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE;YACP,OAAO,EAAE,YAAY,OAAO,CAAC,IAAI,EAAE;SACpC;KACF,CAAC;IAEF,SAAS,CAAC,SAAS,CAAC,GAAG;QACrB,QAAQ,EAAE,4BAA4B;QACtC,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,YAAY,CAAC,GAAG;QACxB,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,QAAQ,CAAC;QAC5C,OAAO,EAAE;YACP,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,QAAQ,OAAO,CAAC,cAAc,oBAAoB;SACjE;KACF,CAAC;IAEF,SAAS,CAAC,aAAa,CAAC,GAAG;QACzB,QAAQ,EAAE,gCAAgC;QAC1C,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,eAAe,CAAC,GAAG;QAC3B,QAAQ,EAAE,kCAAkC;QAC5C,OAAO,EAAE;YACP,GAAG,OAAO,CAAC,cAAc,mCAAmC;YAC5D,GAAG,OAAO,CAAC,cAAc,gCAAgC;SAC1D;QACD,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,GAAG;QAC5B,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,QAAQ,EAAE,SAAS;YACnB,YAAY,EAAE,QAAQ,OAAO,CAAC,cAAc,wBAAwB;SACrE;KACF,CAAC;IAEF,SAAS,CAAC,WAAW,CAAC,GAAG;QACvB,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,SAAS,CAAC,gBAAgB,CAAC,GAAG;QAC5B,QAAQ,EAAE,mCAAmC;QAC7C,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC"}
@@ -29,7 +29,8 @@ describe('Normalize Options', () => {
29
29
  parsedTags: [],
30
30
  projectName: 'my-app',
31
31
  linter: Linter.EsLint,
32
- entryFile: '/virtual/apps/my-app/src/main.tsx',
32
+ entryFile: 'apps/my-app/src/main.tsx',
33
+ entryFileAbsolutePath: '/virtual/apps/my-app/src/main.tsx',
33
34
  e2eTestRunner: 'none',
34
35
  unitTestRunner: 'jest',
35
36
  });
@@ -51,7 +52,8 @@ describe('Normalize Options', () => {
51
52
  name: 'my-app',
52
53
  parsedTags: [],
53
54
  projectName: 'my-app',
54
- entryFile: '/virtual/apps/my-app/src/main.tsx',
55
+ entryFile: 'apps/my-app/src/main.tsx',
56
+ entryFileAbsolutePath: '/virtual/apps/my-app/src/main.tsx',
55
57
  e2eTestRunner: 'none',
56
58
  unitTestRunner: 'jest',
57
59
  });
@@ -75,7 +77,8 @@ describe('Normalize Options', () => {
75
77
  directory: 'directory',
76
78
  parsedTags: [],
77
79
  projectName: 'directory-my-app',
78
- entryFile: '/virtual/apps/directory/my-app/src/main.tsx',
80
+ entryFile: 'apps/directory/my-app/src/main.tsx',
81
+ entryFileAbsolutePath: '/virtual/apps/directory/my-app/src/main.tsx',
79
82
  e2eTestRunner: 'none',
80
83
  unitTestRunner: 'jest',
81
84
  });
@@ -97,7 +100,8 @@ describe('Normalize Options', () => {
97
100
  name: 'directory/my-app',
98
101
  parsedTags: [],
99
102
  projectName: 'directory-my-app',
100
- entryFile: '/virtual/apps/directory/my-app/src/main.tsx',
103
+ entryFile: 'apps/directory/my-app/src/main.tsx',
104
+ entryFileAbsolutePath: '/virtual/apps/directory/my-app/src/main.tsx',
101
105
  e2eTestRunner: 'none',
102
106
  unitTestRunner: 'jest',
103
107
  });
@@ -120,7 +124,8 @@ describe('Normalize Options', () => {
120
124
  name: 'my-app',
121
125
  parsedTags: [],
122
126
  projectName: 'my-app',
123
- entryFile: '/virtual/apps/my-app/src/main.tsx',
127
+ entryFile: 'apps/my-app/src/main.tsx',
128
+ entryFileAbsolutePath: '/virtual/apps/my-app/src/main.tsx',
124
129
  e2eTestRunner: 'none',
125
130
  unitTestRunner: 'jest',
126
131
  });
@@ -9,5 +9,6 @@ export interface NormalizedSchema extends Schema {
9
9
  androidProjectRoot: string;
10
10
  parsedTags: string[];
11
11
  entryFile: string;
12
+ entryFileAbsolutePath: string;
12
13
  }
13
14
  export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
@@ -18,7 +18,8 @@ function normalizeOptions(host, options) {
18
18
  const parsedTags = options.tags
19
19
  ? options.tags.split(',').map((s) => s.trim())
20
20
  : [];
21
- const entryFile = (0, path_1.join)(host.root, appProjectRoot, '/src/main.tsx');
21
+ const entryFile = (0, path_1.join)(appProjectRoot, options.js ? '/src/main.js' : '/src/main.tsx');
22
+ const entryFileAbsolutePath = (0, path_1.join)(host.root, entryFile);
22
23
  /**
23
24
  * if options.name is "my-app"
24
25
  * name: "my-app", className: 'MyApp', lowerCaseName: 'myapp', displayName: 'MyApp', projectName: 'my-app', appProjectRoot: 'apps/my-app', androidProjectRoot: 'apps/my-app/android', iosProjectRoot: 'apps/my-app/ios'
@@ -29,7 +30,8 @@ function normalizeOptions(host, options) {
29
30
  iosProjectRoot,
30
31
  androidProjectRoot,
31
32
  parsedTags,
32
- entryFile });
33
+ entryFile,
34
+ entryFileAbsolutePath });
33
35
  }
34
36
  exports.normalizeOptions = normalizeOptions;
35
37
  //# sourceMappingURL=normalize-options.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,+BAA4B;AAc5B,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;IAEf,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS;QACrC,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ;QACnC,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,gBAAgB,GAAG,aAAa;QACpC,CAAC,CAAC,GAAG,aAAa,IAAI,QAAQ,EAAE;QAChC,CAAC,CAAC,QAAQ,CAAC;IAEb,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAE3E,MAAM,cAAc,GAAG,QAAQ,gBAAgB,EAAE,CAAC;IAClD,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACnD,MAAM,kBAAkB,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAE3D,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC;IAEnE;;;;;OAKG;IACH,uCACK,OAAO,KACV,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,MAAM,EAChD,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,OAAO,EAC/C,IAAI,EAAE,QAAQ,EACd,SAAS,EACT,aAAa,EAAE,SAAS,CAAC,WAAW,EAAE,EACtC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,SAAS,EAC7C,WAAW,EAAE,cAAc,EAC3B,cAAc;QACd,cAAc;QACd,kBAAkB;QAClB,UAAU;QACV,SAAS,IACT;AACJ,CAAC;AA9CD,4CA8CC"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react-native/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,+BAA4B;AAe5B,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;IAEf,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS;QACrC,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ;QACnC,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,gBAAgB,GAAG,aAAa;QACpC,CAAC,CAAC,GAAG,aAAa,IAAI,QAAQ,EAAE;QAChC,CAAC,CAAC,QAAQ,CAAC;IAEb,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAE3E,MAAM,cAAc,GAAG,QAAQ,gBAAgB,EAAE,CAAC;IAClD,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACnD,MAAM,kBAAkB,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAE3D,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,SAAS,GAAG,IAAA,WAAI,EACpB,cAAc,EACd,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAC9C,CAAC;IAEF,MAAM,qBAAqB,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAEzD;;;;;OAKG;IACH,uCACK,OAAO,KACV,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,MAAM,EAChD,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,OAAO,EAC/C,IAAI,EAAE,QAAQ,EACd,SAAS,EACT,aAAa,EAAE,SAAS,CAAC,WAAW,EAAE,EACtC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,SAAS,EAC7C,WAAW,EAAE,cAAc,EAC3B,cAAc;QACd,cAAc;QACd,kBAAkB;QAClB,UAAU;QACV,SAAS;QACT,qBAAqB,IACrB;AACJ,CAAC;AApDD,4CAoDC"}
@@ -31,26 +31,16 @@ function reactNativeInitGenerator(host, schema) {
31
31
  }
32
32
  exports.reactNativeInitGenerator = reactNativeInitGenerator;
33
33
  function updateDependencies(host) {
34
+ const isPnpm = (0, devkit_1.detectPackageManager)(host.root) === 'pnpm';
34
35
  return (0, devkit_1.addDependenciesToPackageJson)(host, {
35
36
  react: versions_2.reactVersion,
36
37
  'react-native': versions_1.reactNativeVersion,
37
- }, {
38
- '@nrwl/react-native': versions_1.nxVersion,
39
- '@types/react': versions_2.typesReactVersion,
40
- '@types/react-native': versions_1.typesReactNativeVersion,
41
- '@react-native-community/cli': versions_1.reactNativeCommunityCli,
42
- '@react-native-community/cli-platform-android': versions_1.reactNativeCommunityCliAndroid,
43
- '@react-native-community/cli-platform-ios': versions_1.reactNativeCommunityCliIos,
44
- 'metro-react-native-babel-preset': versions_1.metroReactNativeBabelPresetVersion,
45
- '@testing-library/react-native': versions_1.testingLibraryReactNativeVersion,
46
- '@testing-library/jest-native': versions_1.testingLibraryJestNativeVersion,
47
- 'jest-react-native': versions_1.jestReactNativeVersion,
48
- metro: versions_1.metroVersion,
49
- 'metro-resolver': versions_1.metroVersion,
50
- 'react-test-renderer': versions_1.reactTestRendererVersion,
51
- 'react-native-svg-transformer': versions_1.reactNativeSvgTransformerVersion,
52
- 'react-native-svg': versions_1.reactNativeSvgVersion,
53
- });
38
+ }, Object.assign({ '@nrwl/react-native': versions_1.nxVersion, '@types/react': versions_2.typesReactVersion, '@types/react-native': versions_1.typesReactNativeVersion, '@react-native-community/cli': versions_1.reactNativeCommunityCli, '@react-native-community/cli-platform-android': versions_1.reactNativeCommunityCliAndroid, '@react-native-community/cli-platform-ios': versions_1.reactNativeCommunityCliIos, 'metro-react-native-babel-preset': versions_1.metroReactNativeBabelPresetVersion, '@testing-library/react-native': versions_1.testingLibraryReactNativeVersion, '@testing-library/jest-native': versions_1.testingLibraryJestNativeVersion, 'jest-react-native': versions_1.jestReactNativeVersion, metro: versions_1.metroVersion, 'metro-resolver': versions_1.metroVersion, 'react-test-renderer': versions_1.reactTestRendererVersion, 'react-native-svg-transformer': versions_1.reactNativeSvgTransformerVersion, 'react-native-svg': versions_1.reactNativeSvgVersion }, (isPnpm
39
+ ? {
40
+ 'metro-config': versions_1.metroVersion,
41
+ '@babel/runtime': versions_1.babelRuntimeVersion, // @babel/runtime is used by react-native-svg
42
+ }
43
+ : {})));
54
44
  }
55
45
  exports.updateDependencies = updateDependencies;
56
46
  function moveDependency(host) {
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,iGAA4F;AAC5F,yCAMsB;AAEtB,mDAe8B;AAC9B,2FAAqF;AACrF,qEAA+D;AAC/D,qCAA+C;AAC/C,uCAAiD;AACjD,6DAGwC;AAExC,SAAsB,wBAAwB,CAAC,IAAU,EAAE,MAAc;;QACvE,IAAA,6CAAoB,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QACjD,IAAA,wCAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,MAAM,KAAK,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/D,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,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,EAAE,EAAE,CAAC,CAAC;YACrD,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,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AArBD,4DAqBC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,KAAK,EAAE,uBAAY;QACnB,cAAc,EAAE,6BAAkB;KACnC,EACD;QACE,oBAAoB,EAAE,oBAAS;QAC/B,cAAc,EAAE,4BAAiB;QACjC,qBAAqB,EAAE,kCAAuB;QAC9C,6BAA6B,EAAE,kCAAuB;QACtD,8CAA8C,EAC5C,yCAA8B;QAChC,0CAA0C,EAAE,qCAA0B;QACtE,iCAAiC,EAAE,6CAAkC;QACrE,+BAA+B,EAAE,2CAAgC;QACjE,8BAA8B,EAAE,0CAA+B;QAC/D,mBAAmB,EAAE,iCAAsB;QAC3C,KAAK,EAAE,uBAAY;QACnB,gBAAgB,EAAE,uBAAY;QAC9B,qBAAqB,EAAE,mCAAwB;QAC/C,8BAA8B,EAAE,2CAAgC;QAChE,kBAAkB,EAAE,gCAAqB;KAC1C,CACF,CAAC;AACJ,CAAC;AA1BD,gDA0BC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,OAAO,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,kBAAe,wBAAwB,CAAC;AAC3B,QAAA,wBAAwB,GAAG,IAAA,2BAAkB,EACxD,wBAAwB,CACzB,CAAC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,iGAA4F;AAC5F,yCAOsB;AAEtB,mDAgB8B;AAC9B,2FAAqF;AACrF,qEAA+D;AAC/D,qCAA+C;AAC/C,uCAAiD;AACjD,6DAGwC;AAExC,SAAsB,wBAAwB,CAAC,IAAU,EAAE,MAAc;;QACvE,IAAA,6CAAoB,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QACjD,IAAA,wCAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,MAAM,KAAK,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/D,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,QAAQ,GAAG,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,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,EAAE,EAAE,CAAC,CAAC;YACrD,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,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AArBD,4DAqBC;AAED,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,MAAM,MAAM,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC;IAC1D,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,KAAK,EAAE,uBAAY;QACnB,cAAc,EAAE,6BAAkB;KACnC,kBAEC,oBAAoB,EAAE,oBAAS,EAC/B,cAAc,EAAE,4BAAiB,EACjC,qBAAqB,EAAE,kCAAuB,EAC9C,6BAA6B,EAAE,kCAAuB,EACtD,8CAA8C,EAC5C,yCAA8B,EAChC,0CAA0C,EAAE,qCAA0B,EACtE,iCAAiC,EAAE,6CAAkC,EACrE,+BAA+B,EAAE,2CAAgC,EACjE,8BAA8B,EAAE,0CAA+B,EAC/D,mBAAmB,EAAE,iCAAsB,EAC3C,KAAK,EAAE,uBAAY,EACnB,gBAAgB,EAAE,uBAAY,EAC9B,qBAAqB,EAAE,mCAAwB,EAC/C,8BAA8B,EAAE,2CAAgC,EAChE,kBAAkB,EAAE,gCAAqB,IACtC,CAAC,MAAM;QACR,CAAC,CAAC;YACE,cAAc,EAAE,uBAAY;YAC5B,gBAAgB,EAAE,8BAAmB,EAAE,6CAA6C;SACrF;QACH,CAAC,CAAC,EAAE,CAAC,EAEV,CAAC;AACJ,CAAC;AAjCD,gDAiCC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,OAAO,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,kBAAe,wBAAwB,CAAC;AAC3B,QAAA,wBAAwB,GAAG,IAAA,2BAAkB,EACxD,wBAAwB,CACzB,CAAC"}
@@ -21,7 +21,7 @@ function reactNativeLibraryGenerator(host, schema) {
21
21
  if (!options.skipTsConfig) {
22
22
  updateBaseTsConfig(host, options);
23
23
  }
24
- const jestTask = yield (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot);
24
+ const jestTask = yield (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js);
25
25
  if (options.publishable || options.buildable) {
26
26
  updateLibPackageNpmScope(host, options);
27
27
  }
@@ -38,7 +38,7 @@ function addProject(host, options) {
38
38
  const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
39
39
  const external = ['react/jsx-runtime'];
40
40
  targets.build = {
41
- executor: '@nrwl/web:package',
41
+ executor: '@nrwl/web:rollup',
42
42
  outputs: ['{options.outputPath}'],
43
43
  options: {
44
44
  outputPath: `dist/${libsDir}/${options.projectDirectory}`,
@@ -1 +1 @@
1
- {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/library/library.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/library/library.ts"],"names":[],"mappings":"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"}
@@ -221,7 +221,7 @@ describe('lib', () => {
221
221
  const workspaceJson = getProjects(appTree);
222
222
 
223
223
  expect(workspaceJson.get('my-lib').targets.build).toMatchObject({
224
- executor: '@nrwl/web:package',
224
+ executor: '@nrwl/web:rollup',
225
225
  outputs: ['{options.outputPath}'],
226
226
  options: {
227
227
  external: ['react/jsx-runtime'],
@@ -34,8 +34,14 @@ function updateJestConfig(tree) {
34
34
  }
35
35
  try {
36
36
  const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
37
- const setupTestPath = (0, path_1.join)(root, 'test-setup.ts');
38
- if (tree.exists(setupTestPath)) {
37
+ let setupTestPath;
38
+ if (tree.exists((0, path_1.join)(root, `test-setup.ts`))) {
39
+ setupTestPath = (0, path_1.join)(root, `test-setup.ts`);
40
+ }
41
+ else if (tree.exists((0, path_1.join)(root, `test-setup.js`))) {
42
+ setupTestPath = (0, path_1.join)(root, `test-setup.js`);
43
+ }
44
+ if (setupTestPath) {
39
45
  const contents = tree.read(setupTestPath, 'utf-8');
40
46
  tree.write(setupTestPath, contents
41
47
  .replace(`jest.useFakeTimers();`, '')
@@ -43,7 +49,7 @@ function updateJestConfig(tree) {
43
49
  }
44
50
  }
45
51
  catch (_b) {
46
- devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update test-setup.ts for project ${project}.`);
52
+ devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update test-setup for project ${project}.`);
47
53
  }
48
54
  });
49
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"update-jest-for-react-native.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAA4B;AAC5B,iGAA8F;AAE9F,qGAA4F;AAE5F;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,IAAU;IAClC,IAAA,+CAAsB,EACpB,IAAI,EACJ,iBAAiB,EACjB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;QACnB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,OAAO;SACR;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAA,mCAAa,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QAClE,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;QACnD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAEjC,IAAI,eAAe,KAAK,MAAM,IAAI,MAAM,KAAK,cAAc,EAAE;YAC3D,OAAO;SACR;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,CACR,cAAc,EACd,QAAQ;iBACL,OAAO,CACN,qBAAqB,EACrB,0CAA0C,CAC3C;iBACA,OAAO,CACN,uDAAuD,EACvD,EAAE,CACH,CACJ,CAAC;SACH;QAAC,WAAM;YACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,+CAA+C,OAAO,GAAG,CACtE,CAAC;SACH;QAED,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAClD,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;gBAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBACnD,IAAI,CAAC,KAAK,CACR,aAAa,EACb,QAAQ;qBACL,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC;qBACpC,OAAO,CAAC,uCAAuC,EAAE,EAAE,CAAC,CACxD,CAAC;aACH;SACF;QAAC,WAAM;YACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,8CAA8C,OAAO,GAAG,CACrE,CAAC;SACH;IACH,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAA8B,MAAM,CAAC,IAAU;;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAHD,yBAGC"}
1
+ {"version":3,"file":"update-jest-for-react-native.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAA4B;AAC5B,iGAA8F;AAE9F,qGAA4F;AAE5F;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,IAAU;IAClC,IAAA,+CAAsB,EACpB,IAAI,EACJ,iBAAiB,EACjB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;QACnB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,OAAO;SACR;QAED,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAA,mCAAa,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QAClE,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;QACnD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAEjC,IAAI,eAAe,KAAK,MAAM,IAAI,MAAM,KAAK,cAAc,EAAE;YAC3D,OAAO;SACR;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,CACR,cAAc,EACd,QAAQ;iBACL,OAAO,CACN,qBAAqB,EACrB,0CAA0C,CAC3C;iBACA,OAAO,CACN,uDAAuD,EACvD,EAAE,CACH,CACJ,CAAC;SACH;QAAC,WAAM;YACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,+CAA+C,OAAO,GAAG,CACtE,CAAC;SACH;QAED,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACzD,IAAI,aAAqB,CAAC;YAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,EAAE;gBAC5C,aAAa,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAC7C;iBAAM,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,EAAE;gBACnD,aAAa,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;aAC7C;YAED,IAAI,aAAa,EAAE;gBACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBACnD,IAAI,CAAC,KAAK,CACR,aAAa,EACb,QAAQ;qBACL,OAAO,CAAC,uBAAuB,EAAE,EAAE,CAAC;qBACpC,OAAO,CAAC,uCAAuC,EAAE,EAAE,CAAC,CACxD,CAAC;aACH;SACF;QAAC,WAAM;YACN,eAAM,CAAC,KAAK,CACV,IAAA,qBAAY,EAAA,2CAA2C,OAAO,GAAG,CAClE,CAAC;SACH;IACH,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAA8B,MAAM,CAAC,IAAU;;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAHD,yBAGC"}
@@ -1,2 +1,2 @@
1
1
  import { Tree } from '@nrwl/devkit';
2
- export declare function addJest(host: Tree, unitTestRunner: 'jest' | 'none', projectName: string, appProjectRoot: string): Promise<import("@nrwl/devkit").GeneratorCallback>;
2
+ export declare function addJest(host: Tree, unitTestRunner: 'jest' | 'none', projectName: string, appProjectRoot: string, js: boolean): Promise<import("@nrwl/devkit").GeneratorCallback>;
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addJest = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const jest_1 = require("@nrwl/jest");
6
- function addJest(host, unitTestRunner, projectName, appProjectRoot) {
6
+ function addJest(host, unitTestRunner, projectName, appProjectRoot, js) {
7
7
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
8
8
  if (unitTestRunner !== 'jest') {
9
9
  return () => { };
@@ -23,7 +23,7 @@ function addJest(host, unitTestRunner, projectName, appProjectRoot) {
23
23
  testRunner: 'jest-jasmine2',
24
24
  resolver: '@nrwl/jest/plugins/resolver',
25
25
  moduleFileExtensions: ['ts', 'js', 'html', 'tsx', 'jsx'],
26
- setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
26
+ setupFilesAfterEnv: ['<rootDir>/test-setup.${js ? 'js' : 'ts'}'],
27
27
  moduleNameMapper: {
28
28
  '\\.svg': '@nrwl/react-native/plugins/jest/svg-mock'
29
29
  },
@@ -1 +1 @@
1
- {"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/add-jest.ts"],"names":[],"mappings":";;;;AACA,qCAAkD;AAElD,SAAsB,OAAO,CAC3B,IAAU,EACV,cAA+B,EAC/B,WAAmB,EACnB,cAAsB;;QAEtB,IAAI,cAAc,KAAK,MAAM,EAAE;YAC7B,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;YAChD,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,IAAI;YACrB,SAAS,EAAE,MAAM;YACjB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,kGAAkG;QAClG,MAAM,UAAU,GAAG,GAAG,cAAc,iBAAiB,CAAC;QACtD,MAAM,OAAO,GAAG;kBACA,WAAW;;;;;;;;;;;;;;;GAe1B,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEhC,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAxCD,0BAwCC"}
1
+ {"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/add-jest.ts"],"names":[],"mappings":";;;;AACA,qCAAkD;AAElD,SAAsB,OAAO,CAC3B,IAAU,EACV,cAA+B,EAC/B,WAAmB,EACnB,cAAsB,EACtB,EAAW;;QAEX,IAAI,cAAc,KAAK,MAAM,EAAE;YAC7B,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,EAAE;YAChD,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,IAAI;YACrB,SAAS,EAAE,MAAM;YACjB,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,kGAAkG;QAClG,MAAM,UAAU,GAAG,GAAG,cAAc,iBAAiB,CAAC;QACtD,MAAM,OAAO,GAAG;kBACA,WAAW;;;;;+CAKkB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;;;;;;;;;;GAU5D,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEhC,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAzCD,0BAyCC"}
@@ -23,26 +23,14 @@ function addLinting(host, projectName, appProjectRoot, tsConfigPaths, linter, se
23
23
  }
24
24
  const reactEslintJson = (0, react_1.createReactEslintJson)(appProjectRoot, setParserOptionsProject);
25
25
  (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(appProjectRoot, '.eslintrc.json'), (json) => {
26
+ var _a;
26
27
  json = reactEslintJson;
27
28
  json.ignorePatterns = ['!**/*', 'public', '.cache', 'node_modules'];
28
- for (const override of json.overrides) {
29
- if (!override.files || override.files.length !== 2) {
30
- continue;
31
- }
32
- // for files ['*.tsx', '*.ts'], add rule '@typescript-eslint/ban-ts-comment': 'off'
33
- if (override.files.includes('*.ts') &&
34
- override.files.includes('*.tsx')) {
35
- override.rules = override.rules || {};
36
- override.rules['@typescript-eslint/ban-ts-comment'] = 'off';
37
- continue;
38
- }
39
- // for files ['*.js', '*.jsx'], add rule '@typescript-eslint/no-var-requires': 'off'
40
- if (override.files.includes('*.js') &&
41
- override.files.includes('*.jsx')) {
42
- override.rules = override.rules || {};
43
- override.rules['@typescript-eslint/no-var-requires'] = 'off';
44
- continue;
45
- }
29
+ // Find the override that handles both TS and JS files.
30
+ const commonOverride = (_a = json.overrides) === null || _a === void 0 ? void 0 : _a.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
31
+ if (commonOverride) {
32
+ commonOverride.rules = commonOverride.rules || {};
33
+ commonOverride.rules['@typescript-eslint/ban-ts-comment'] = 'off';
46
34
  }
47
35
  return json;
48
36
  });
@@ -1 +1 @@
1
- {"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/add-linting.ts"],"names":[],"mappings":";;;;AAAA,2FAAqF;AACrF,yCAA4D;AAC5D,yCAKsB;AACtB,uCAA6E;AAG7E,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;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YAC5B,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,eAAe,GAAG,IAAA,6BAAqB,EAC3C,cAAc,EACd,uBAAuB,CACxB,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,gBAAgB,CAAC,EACnD,CAAC,IAAyB,EAAE,EAAE;YAC5B,IAAI,GAAG,eAAe,CAAC;YACvB,IAAI,CAAC,cAAc,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;YAEpE,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;gBACrC,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBAClD,SAAS;iBACV;gBAED,mFAAmF;gBACnF,IACE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC/B,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAChC;oBACA,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;oBACtC,QAAQ,CAAC,KAAK,CAAC,mCAAmC,CAAC,GAAG,KAAK,CAAC;oBAC5D,SAAS;iBACV;gBAED,oFAAoF;gBACpF,IACE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC/B,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAChC;oBACA,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC;oBACtC,QAAQ,CAAC,KAAK,CAAC,oCAAoC,CAAC,GAAG,KAAK,CAAC;oBAC7D,SAAS;iBACV;aACF;YAED,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,sCAAgB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;CAAA;AAzED,gCAyEC"}
1
+ {"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/add-linting.ts"],"names":[],"mappings":";;;;AAAA,2FAAqF;AACrF,yCAA4D;AAC5D,yCAKsB;AACtB,uCAA6E;AAG7E,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;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YAC5B,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,eAAe,GAAG,IAAA,6BAAqB,EAC3C,cAAc,EACd,uBAAuB,CACxB,CAAC;QAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,cAAc,EAAE,gBAAgB,CAAC,EACnD,CAAC,IAAyB,EAAE,EAAE;;YAC5B,IAAI,GAAG,eAAe,CAAC;YACvB,IAAI,CAAC,cAAc,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;YAEpE,uDAAuD;YACvD,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAChD,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACzE,CAAC;YACF,IAAI,cAAc,EAAE;gBAClB,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,IAAI,EAAE,CAAC;gBAClD,cAAc,CAAC,KAAK,CAAC,mCAAmC,CAAC,GAAG,KAAK,CAAC;aACnE;YAED,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,sCAAgB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACjD,CAAC;CAAA;AAxDD,gCAwDC"}
@@ -4,17 +4,6 @@ exports.ensureNodeModulesSymlink = void 0;
4
4
  const path_1 = require("path");
5
5
  const os_1 = require("os");
6
6
  const fs = require("fs");
7
- const fileutils_1 = require("@nrwl/workspace/src/utilities/fileutils");
8
- const chalk = require("chalk");
9
- const requiredPackages = [
10
- 'react-native',
11
- 'jsc-android',
12
- '@react-native-community/cli-platform-ios',
13
- '@react-native-community/cli-platform-android',
14
- 'hermes-engine',
15
- '@nrwl/react-native',
16
- '@babel/runtime',
17
- ];
18
7
  /**
19
8
  * This function symlink workspace node_modules folder with app project's node_mdules folder.
20
9
  * For yarn and npm, it will symlink the entire node_modules folder.
@@ -28,83 +17,13 @@ function ensureNodeModulesSymlink(workspaceRoot, projectRoot) {
28
17
  if (!fs.existsSync(worksapceNodeModulesPath)) {
29
18
  throw new Error(`Cannot find ${worksapceNodeModulesPath}`);
30
19
  }
31
- const appNodeModulesPath = (0, path_1.join)(projectRoot, 'node_modules');
20
+ const appNodeModulesPath = (0, path_1.join)(workspaceRoot, projectRoot, 'node_modules');
32
21
  // `mklink /D` requires admin privilege in Windows so we need to use junction
33
22
  const symlinkType = (0, os_1.platform)() === 'win32' ? 'junction' : 'dir';
34
23
  if (fs.existsSync(appNodeModulesPath)) {
35
24
  fs.rmdirSync(appNodeModulesPath, { recursive: true });
36
25
  }
37
26
  fs.symlinkSync(worksapceNodeModulesPath, appNodeModulesPath, symlinkType);
38
- if (isPnpm(workspaceRoot)) {
39
- symlinkPnpm(workspaceRoot, appNodeModulesPath, symlinkType);
40
- }
41
27
  }
42
28
  exports.ensureNodeModulesSymlink = ensureNodeModulesSymlink;
43
- function isPnpm(workspaceRoot) {
44
- const pnpmDir = (0, path_1.join)(workspaceRoot, 'node_modules/.pnpm');
45
- return fs.existsSync(pnpmDir);
46
- }
47
- function symlinkPnpm(workspaceRoot, appNodeModulesPath, symlinkType) {
48
- const worksapcePackageJsonPath = (0, path_1.join)(workspaceRoot, 'package.json');
49
- const workspacePackageJson = (0, fileutils_1.readJsonFile)(worksapcePackageJsonPath);
50
- const workspacePackages = Object.keys(Object.assign(Object.assign({}, workspacePackageJson.dependencies), workspacePackageJson.devDependencies));
51
- const packagesToSymlink = new Set([
52
- ...workspacePackages,
53
- ...requiredPackages,
54
- ]);
55
- (0, fileutils_1.createDirectory)(appNodeModulesPath);
56
- packagesToSymlink.forEach((p) => {
57
- const dir = (0, path_1.join)(appNodeModulesPath, p);
58
- if (!fs.existsSync(dir)) {
59
- if (isScopedPackage(p))
60
- (0, fileutils_1.createDirectory)((0, path_1.join)(appNodeModulesPath, getScopedData(p).scope));
61
- fs.symlinkSync(locateNpmPackage(workspaceRoot, p), dir, symlinkType);
62
- }
63
- if (!fs.existsSync((0, path_1.join)(dir, 'package.json'))) {
64
- throw new Error(`Invalid symlink ${chalk.bold(dir)}. Remove ${chalk.bold(appNodeModulesPath)} and try again.`);
65
- }
66
- });
67
- }
68
- function locateNpmPackage(workspaceRoot, packageName) {
69
- const pnpmDir = (0, path_1.join)(workspaceRoot, 'node_modules/.pnpm');
70
- let candidates;
71
- if (isScopedPackage(packageName)) {
72
- const { scope, name } = getScopedData(packageName);
73
- candidates = fs
74
- .readdirSync(pnpmDir)
75
- .filter((f) => f.startsWith(`${scope}+${name}`) &&
76
- fs.lstatSync((0, path_1.join)(pnpmDir, f)).isDirectory());
77
- }
78
- else {
79
- candidates = fs
80
- .readdirSync(pnpmDir)
81
- .filter((f) => f.startsWith(packageName) &&
82
- fs.lstatSync((0, path_1.join)(pnpmDir, f)).isDirectory());
83
- }
84
- if (candidates.length === 0) {
85
- throw new Error(`Could not locate pnpm directory for ${packageName}`);
86
- }
87
- else if (candidates.length === 1) {
88
- return (0, path_1.join)(pnpmDir, candidates[0], 'node_modules', packageName);
89
- }
90
- else {
91
- const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(workspaceRoot, 'package.json'));
92
- const deps = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
93
- const version = deps[packageName];
94
- const found = candidates.find((c) => c.includes(version));
95
- if (found) {
96
- return (0, path_1.join)(pnpmDir, found, 'node_modules', packageName);
97
- }
98
- else {
99
- throw new Error(`Cannot find ${packageName}@${version}. Install it with 'pnpm install --save ${packageName}@${version}'.`);
100
- }
101
- }
102
- }
103
- function isScopedPackage(p) {
104
- return p.startsWith('@');
105
- }
106
- function getScopedData(p) {
107
- const [scope, name] = p.split('/');
108
- return { scope, name };
109
- }
110
29
  //# sourceMappingURL=ensure-node-modules-symlink.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ensure-node-modules-symlink.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/ensure-node-modules-symlink.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ensure-node-modules-symlink.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/ensure-node-modules-symlink.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,2BAA8B;AAC9B,yBAAyB;AAGzB;;;;;;;GAOG;AACH,SAAgB,wBAAwB,CACtC,aAAqB,EACrB,WAAmB;IAEnB,MAAM,wBAAwB,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CAAC,eAAe,wBAAwB,EAAE,CAAC,CAAC;KAC5D;IAED,MAAM,kBAAkB,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;IAC5E,6EAA6E;IAC7E,MAAM,WAAW,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAEhE,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE;QACrC,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KACvD;IACD,EAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC;AAC5E,CAAC;AAjBD,4DAiBC"}
@@ -4,19 +4,18 @@ import * as fs from 'fs';
4
4
  import { ensureNodeModulesSymlink } from './ensure-node-modules-symlink';
5
5
 
6
6
  const workspaceDir = join(tmpdir(), 'nx-react-native-test');
7
+ const appDir = 'apps/myapp';
8
+ const appDirAbsolutePath = join(workspaceDir, appDir);
7
9
 
8
10
  describe('ensureNodeModulesSymlink', () => {
9
- let appDir: string;
10
-
11
11
  beforeEach(() => {
12
- appDir = join(workspaceDir, 'apps/myapp');
13
12
  if (fs.existsSync(workspaceDir))
14
13
  fs.rmdirSync(workspaceDir, { recursive: true });
15
14
  fs.mkdirSync(workspaceDir);
16
- fs.mkdirSync(appDir, { recursive: true });
17
- fs.mkdirSync(appDir, { recursive: true });
15
+ fs.mkdirSync(appDirAbsolutePath, { recursive: true });
16
+ fs.mkdirSync(appDirAbsolutePath, { recursive: true });
18
17
  fs.writeFileSync(
19
- join(appDir, 'package.json'),
18
+ join(appDirAbsolutePath, 'package.json'),
20
19
  JSON.stringify({
21
20
  name: 'myapp',
22
21
  dependencies: { 'react-native': '*' },
@@ -91,85 +90,6 @@ describe('ensureNodeModulesSymlink', () => {
91
90
  expectSymlinkToExist('random');
92
91
  });
93
92
 
94
- it('should support pnpm', () => {
95
- createPnpmDirectory('@nrwl/react-native', '9999.9.9');
96
- createPnpmDirectory(
97
- '@react-native-community/cli-platform-android',
98
- '7777.7.7'
99
- );
100
- createPnpmDirectory('@react-native-community/cli-platform-ios', '7777.7.7');
101
- createPnpmDirectory('hermes-engine', '3333.3.3');
102
- createPnpmDirectory('react-native', '0.9999.0');
103
- createPnpmDirectory('jsc-android', '888888.0.0');
104
- createPnpmDirectory('@babel/runtime', '5555.0.0');
105
-
106
- ensureNodeModulesSymlink(workspaceDir, appDir);
107
-
108
- expectSymlinkToExist('react-native');
109
- expectSymlinkToExist('jsc-android');
110
- expectSymlinkToExist('hermes-engine');
111
- expectSymlinkToExist('@react-native-community/cli-platform-ios');
112
- expectSymlinkToExist('@react-native-community/cli-platform-android');
113
- expectSymlinkToExist('@babel/runtime');
114
- });
115
-
116
- it('should support pnpm with multiple react-native versions', () => {
117
- createPnpmDirectory('@nrwl/react-native', '9999.9.9');
118
- createPnpmDirectory(
119
- '@react-native-community/cli-platform-android',
120
- '7777.7.7'
121
- );
122
- createPnpmDirectory('@react-native-community/cli-platform-ios', '7777.7.7');
123
- createPnpmDirectory('hermes-engine', '3333.3.3');
124
- createPnpmDirectory('react-native', '0.9999.0');
125
- createPnpmDirectory('react-native', '0.59.1');
126
- createPnpmDirectory('jsc-android', '888888.0.0');
127
- createPnpmDirectory('@babel/runtime', '5555.0.0');
128
-
129
- ensureNodeModulesSymlink(workspaceDir, appDir);
130
-
131
- expectSymlinkToExist('react-native');
132
- expectSymlinkToExist('jsc-android');
133
- expectSymlinkToExist('hermes-engine');
134
- expectSymlinkToExist('@react-native-community/cli-platform-ios');
135
- expectSymlinkToExist('@react-native-community/cli-platform-android');
136
- expectSymlinkToExist('@babel/runtime');
137
- });
138
-
139
- it('should throw error if pnpm package cannot be matched', () => {
140
- createPnpmDirectory('@nrwl/react-native', '9999.9.9');
141
- createPnpmDirectory(
142
- '@react-native-community/cli-platform-android',
143
- '7777.7.7'
144
- );
145
- createPnpmDirectory('@react-native-community/cli-platform-ios', '7777.7.7');
146
- createPnpmDirectory('hermes-engine', '3333.3.3');
147
- createPnpmDirectory('jsc-android', '888888.0.0');
148
- createPnpmDirectory('react-native', '0.60.1');
149
- createPnpmDirectory('react-native', '0.59.1');
150
- createPnpmDirectory('@babel/runtime', '5555.0.0');
151
-
152
- expect(() => {
153
- ensureNodeModulesSymlink(workspaceDir, appDir);
154
- }).toThrow(/Cannot find/);
155
- });
156
-
157
- function createPnpmDirectory(packageName, version) {
158
- const dir = join(
159
- workspaceDir,
160
- `node_modules/.pnpm/${packageName.replace(
161
- '/',
162
- '+'
163
- )}@${version}/node_modules/${packageName}`
164
- );
165
- fs.mkdirSync(dir, { recursive: true });
166
- fs.writeFileSync(
167
- join(dir, 'package.json'),
168
- JSON.stringify({ name: packageName, version: version })
169
- );
170
- return dir;
171
- }
172
-
173
93
  function createNpmDirectory(packageName, version) {
174
94
  const dir = join(workspaceDir, `node_modules/${packageName}`);
175
95
  fs.mkdirSync(dir, { recursive: true });
@@ -182,7 +102,9 @@ describe('ensureNodeModulesSymlink', () => {
182
102
 
183
103
  function expectSymlinkToExist(packageName) {
184
104
  expect(
185
- fs.existsSync(join(appDir, `node_modules/${packageName}/package.json`))
105
+ fs.existsSync(
106
+ join(appDirAbsolutePath, `node_modules/${packageName}/package.json`)
107
+ )
186
108
  ).toBe(true);
187
109
  }
188
110
  });
@@ -1,8 +1,8 @@
1
1
  import { GeneratorCallback } from '@nrwl/devkit';
2
2
  /**
3
- * Run pod install on current working directory
4
- * @param cwd current working directory
3
+ * Run pod install on ios directory
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(cwd: string): GeneratorCallback;
8
- export declare function podInstall(cwd: string): Promise<void>;
7
+ export declare function runPodInstall(iosDirectory: string): GeneratorCallback;
8
+ export declare function podInstall(iosDirectory: string): Promise<void>;
@@ -16,25 +16,25 @@ If the path is wrong, switch the path: (your path may be different)
16
16
  ${chalk.bold('sudo xcode-select --switch /Applications/Xcode.app')}
17
17
  `;
18
18
  /**
19
- * Run pod install on current working directory
20
- * @param cwd current working directory
19
+ * Run pod install on ios directory
20
+ * @param iosDirectory ios directory that contains Podfile
21
21
  * @returns resolve with 0 if not error, reject with error otherwise
22
22
  */
23
- function runPodInstall(cwd) {
23
+ function runPodInstall(iosDirectory) {
24
24
  return () => {
25
25
  if ((0, os_1.platform)() !== 'darwin') {
26
26
  devkit_1.logger.info('Skipping `pod install` on non-darwin platform');
27
27
  return;
28
28
  }
29
- devkit_1.logger.info(`Running \`pod install\` from "${cwd}"`);
30
- return podInstall(cwd);
29
+ devkit_1.logger.info(`Running \`pod install\` from "${iosDirectory}"`);
30
+ return podInstall(iosDirectory);
31
31
  };
32
32
  }
33
33
  exports.runPodInstall = runPodInstall;
34
- function podInstall(cwd) {
34
+ function podInstall(iosDirectory) {
35
35
  return new Promise((resolve, reject) => {
36
36
  const process = (0, child_process_1.spawn)('pod', ['install'], {
37
- cwd,
37
+ cwd: iosDirectory,
38
38
  stdio: [0, 1, 2],
39
39
  });
40
40
  process.on('close', (code) => {
@@ -1 +1 @@
1
- {"version":3,"file":"pod-install-task.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/pod-install-task.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AACtC,2BAA8B;AAC9B,+BAA+B;AAC/B,yCAAyD;AAEzD,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,CAAC,GAAW;IACvC,OAAO,GAAG,EAAE;QACV,IAAI,IAAA,aAAQ,GAAE,KAAK,QAAQ,EAAE;YAC3B,eAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YAC7D,OAAO;SACR;QAED,eAAM,CAAC,IAAI,CAAC,iCAAiC,GAAG,GAAG,CAAC,CAAC;QAErD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC,CAAC;AACJ,CAAC;AAXD,sCAWC;AAED,SAAgB,UAAU,CAAC,GAAW;IACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,IAAA,qBAAK,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE;YACxC,GAAG;YACH,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACnC,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACvB,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,gCAmBC"}
1
+ {"version":3,"file":"pod-install-task.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/pod-install-task.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AACtC,2BAA8B;AAC9B,+BAA+B;AAC/B,yCAAyD;AAEzD,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,CAAC,YAAoB;IAChD,OAAO,GAAG,EAAE;QACV,IAAI,IAAA,aAAQ,GAAE,KAAK,QAAQ,EAAE;YAC3B,eAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YAC7D,OAAO;SACR;QAED,eAAM,CAAC,IAAI,CAAC,iCAAiC,YAAY,GAAG,CAAC,CAAC;QAE9D,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;IAClC,CAAC,CAAC;AACJ,CAAC;AAXD,sCAWC;AAED,SAAgB,UAAU,CAAC,YAAoB;IAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,IAAA,qBAAK,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE;YACxC,GAAG,EAAE,YAAY;YACjB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACnC,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACvB,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,gCAmBC"}
@@ -1,2 +1,2 @@
1
1
  import { GeneratorCallback } from '@nrwl/devkit';
2
- export declare function runSymlink(projectRoot: string): GeneratorCallback;
2
+ export declare function runSymlink(worksapceRoot: string, projectRoot: string): GeneratorCallback;