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

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 (47) 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 +4 -4
  31. package/src/generators/application/application.js.map +1 -1
  32. package/src/generators/application/lib/normalize-options.js +1 -1
  33. package/src/generators/application/lib/normalize-options.js.map +1 -1
  34. package/src/generators/init/init.js +7 -17
  35. package/src/generators/init/init.js.map +1 -1
  36. package/src/utils/ensure-node-modules-symlink.js +1 -82
  37. package/src/utils/ensure-node-modules-symlink.js.map +1 -1
  38. package/src/utils/ensure-node-modules-symlink.spec.ts +8 -86
  39. package/src/utils/pod-install-task.d.ts +4 -4
  40. package/src/utils/pod-install-task.js +7 -7
  41. package/src/utils/pod-install-task.js.map +1 -1
  42. package/src/utils/symlink-task.d.ts +1 -1
  43. package/src/utils/symlink-task.js +2 -3
  44. package/src/utils/symlink-task.js.map +1 -1
  45. package/src/utils/versions.d.ts +1 -0
  46. package/src/utils/versions.js +3 -2
  47. package/src/utils/versions.js.map +1 -1
@@ -61,7 +61,7 @@ function runCliStart(workspaceRoot, projectRoot, options) {
61
61
  exports.runCliStart = runCliStart;
62
62
  function startAsync(workspaceRoot, projectRoot, options) {
63
63
  return new Promise((resolve, reject) => {
64
- childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['start', ...createStartOptions(options)], { cwd: projectRoot });
64
+ childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['start', ...createStartOptions(options)], { cwd: (0, path_1.join)(workspaceRoot, projectRoot) });
65
65
  // Ensure the child process is killed when the parent exits
66
66
  process.on('exit', () => childProcess.kill());
67
67
  process.on('SIGTERM', () => childProcess.kill());
@@ -1 +1 @@
1
- {"version":3,"file":"start.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/start/start.impl.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,yCAAuD;AACvD,iDAAmD;AACnD,+BAA4B;AAC5B,yFAAmF;AACnF,mEAA8D;AAQ9D,IAAI,YAA0B,CAAC;AAE/B,SAA+B,aAAa,CAC1C,OAAgC,EAChC,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACzE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,MAAM,OAAO,GAAG,oBAAoB,OAAO,CAAC,IAAI,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;YACpC,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC,CAAC;YAC3D,eAAM,CAAC,IAAI,CACT,OAAO,KAAK,CAAC,IAAI,CAAC,kBAAkB,OAAO,EAAE,CAAC,OAAO,KAAK,CAAC,IAAI,CAC7D,cAAc,OAAO,EAAE,CACxB,yBAAyB,CAC3B,CAAC;YAEF,2BAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YAEtD,iCAAM;gBACJ,OAAO;gBACP,OAAO,EAAE,IAAI;aACd,CAAA,CAAC;SACH;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AA5BD,gCA4BC;AAED;;;GAGG;AACH,SAAsB,WAAW,CAC/B,aAAqB,EACrB,WAAmB,EACnB,OAAgC;;QAEhC,MAAM,MAAM,GAAG,MAAM,IAAA,uCAAiB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,eAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;SAC3C;aAAM,IAAI,MAAM,KAAK,cAAc,EAAE;YACpC,eAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;SAC1C;aAAM;YACL,2BAA2B;YAC3B,eAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAErC,IAAI;gBACF,MAAM,UAAU,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACvD;YAAC,OAAO,KAAK,EAAE;gBACd,eAAM,CAAC,KAAK,CACV,uDAAuD,KAAK,CAAC,OAAO,EAAE,CACvE,CAAC;gBACF,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;CAAA;AAvBD,kCAuBC;AAED,SAAS,UAAU,CACjB,aAAqB,EACrB,WAAmB,EACnB,OAAgC;IAEhC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,oCAAoC,CAAC,EACzD,CAAC,OAAO,EAAE,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,EACzC,EAAE,GAAG,EAAE,WAAW,EAAE,CACrB,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAO;IACjC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,IAAI,CAAC,KAAK,YAAY,EAAE;YACtB,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;gBACvB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC3B;SACF;aAAM;YACL,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
1
+ {"version":3,"file":"start.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/start/start.impl.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,yCAAuD;AACvD,iDAAmD;AACnD,+BAA4B;AAC5B,yFAAmF;AACnF,mEAA8D;AAQ9D,IAAI,YAA0B,CAAC;AAE/B,SAA+B,aAAa,CAC1C,OAAgC,EAChC,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACzE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,MAAM,OAAO,GAAG,oBAAoB,OAAO,CAAC,IAAI,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;YACpC,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAwB,OAAO,EAAE,CAAC,CAAC,CAAC;YAC3D,eAAM,CAAC,IAAI,CACT,OAAO,KAAK,CAAC,IAAI,CAAC,kBAAkB,OAAO,EAAE,CAAC,OAAO,KAAK,CAAC,IAAI,CAC7D,cAAc,OAAO,EAAE,CACxB,yBAAyB,CAC3B,CAAC;YAEF,2BAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YAEtD,iCAAM;gBACJ,OAAO;gBACP,OAAO,EAAE,IAAI;aACd,CAAA,CAAC;SACH;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AA5BD,gCA4BC;AAED;;;GAGG;AACH,SAAsB,WAAW,CAC/B,aAAqB,EACrB,WAAmB,EACnB,OAAgC;;QAEhC,MAAM,MAAM,GAAG,MAAM,IAAA,uCAAiB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,eAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;SAC3C;aAAM,IAAI,MAAM,KAAK,cAAc,EAAE;YACpC,eAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;SAC1C;aAAM;YACL,2BAA2B;YAC3B,eAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAErC,IAAI;gBACF,MAAM,UAAU,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;aACvD;YAAC,OAAO,KAAK,EAAE;gBACd,eAAM,CAAC,KAAK,CACV,uDAAuD,KAAK,CAAC,OAAO,EAAE,CACvE,CAAC;gBACF,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;CAAA;AAvBD,kCAuBC;AAED,SAAS,UAAU,CACjB,aAAqB,EACrB,WAAmB,EACnB,OAAgC;IAEhC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,oCAAoC,CAAC,EACzD,CAAC,OAAO,EAAE,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,EACzC,EAAE,GAAG,EAAE,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,CAAC,EAAE,CAC1C,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAO;IACjC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,IAAI,CAAC,KAAK,YAAY,EAAE;YACtB,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;gBACvB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC3B;SACF;aAAM;YACL,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
@@ -81,7 +81,7 @@ function startAsync(
81
81
  childProcess = fork(
82
82
  join(workspaceRoot, './node_modules/react-native/cli.js'),
83
83
  ['start', ...createStartOptions(options)],
84
- { cwd: projectRoot }
84
+ { cwd: join(workspaceRoot, projectRoot) }
85
85
  );
86
86
 
87
87
  // Ensure the child process is killed when the parent exits
@@ -4,5 +4,5 @@ export interface ReactNativeSyncDepsOutput {
4
4
  success: boolean;
5
5
  }
6
6
  export default function syncDepsExecutor(options: ReactNativeSyncDepsOptions, context: ExecutorContext): AsyncGenerator<ReactNativeSyncDepsOutput>;
7
- export declare function syncDeps(projectName: string, projectRoot: string, include?: string): Promise<string[]>;
7
+ export declare function syncDeps(projectName: string, projectRoot: string, workspaceRoot: string, include?: string): Promise<string[]>;
8
8
  export declare function displayNewlyAddedDepsMessage(projectName: string, deps: string[]): void;
@@ -11,16 +11,16 @@ const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
11
11
  function syncDepsExecutor(options, context) {
12
12
  return (0, tslib_1.__asyncGenerator)(this, arguments, function* syncDepsExecutor_1() {
13
13
  const projectRoot = context.workspace.projects[context.projectName].root;
14
- displayNewlyAddedDepsMessage(context.projectName, yield (0, tslib_1.__await)(syncDeps(context.projectName, projectRoot, options.include)));
14
+ displayNewlyAddedDepsMessage(context.projectName, yield (0, tslib_1.__await)(syncDeps(context.projectName, projectRoot, context.root, options.include)));
15
15
  yield yield (0, tslib_1.__await)({ success: true });
16
16
  });
17
17
  }
18
18
  exports.default = syncDepsExecutor;
19
- function syncDeps(projectName, projectRoot, include) {
19
+ function syncDeps(projectName, projectRoot, workspaceRoot, include) {
20
20
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
21
21
  const graph = yield (0, project_graph_1.createProjectGraphAsync)();
22
22
  const npmDeps = (0, find_all_npm_dependencies_1.findAllNpmDependencies)(graph, projectName);
23
- const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
23
+ const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
24
24
  const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
25
25
  const newDeps = [];
26
26
  const includeDeps = include === null || include === void 0 ? void 0 : include.split(',');
@@ -1 +1 @@
1
- {"version":3,"file":"sync-deps.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/sync-deps/sync-deps.impl.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,qFAA+E;AAC/E,uEAGiD;AACjD,+BAA+B;AAC/B,yCAAuD;AAEvD,0EAAiF;AAMjF,SAA+B,gBAAgB,CAC7C,OAAmC,EACnC,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACzE,4BAA4B,CAC1B,OAAO,CAAC,WAAW,EACnB,2BAAM,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA,CAClE,CAAC;QAEF,iCAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;IAC1B,CAAC;CAAA;AAXD,mCAWC;AAED,SAAsB,QAAQ,CAC5B,WAAmB,EACnB,WAAmB,EACnB,OAAgB;;QAEhB,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,kDAAsB,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE;YAC7B,WAAW,CAAC,YAAY,GAAG,EAAE,CAAC;YAC9B,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IAAI,WAAW,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;SAC9B;QAED,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACtB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;gBAClC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,GAAG,IAAI,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,EAAE;YACX,IAAA,yBAAa,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC;SAC7C;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAnCD,4BAmCC;AAED,SAAgB,4BAA4B,CAC1C,WAAmB,EACnB,IAAc;IAEd,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,eAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAC5B,MAAM,CACP,yCAAyC,WAAW;IACrD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;KACjE;SAAM;QACL,eAAM,CAAC,IAAI,CACT,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAChB,MAAM,CACP,sBAAsB,WAAW,oCAAoC,CACvE,CAAC;KACH;AACH,CAAC;AAhBD,oEAgBC"}
1
+ {"version":3,"file":"sync-deps.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/sync-deps/sync-deps.impl.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,qFAA+E;AAC/E,uEAGiD;AACjD,+BAA+B;AAC/B,yCAAuD;AAEvD,0EAAiF;AAMjF,SAA+B,gBAAgB,CAC7C,OAAmC,EACnC,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACzE,4BAA4B,CAC1B,OAAO,CAAC,WAAW,EACnB,2BAAM,QAAQ,CACZ,OAAO,CAAC,WAAW,EACnB,WAAW,EACX,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,OAAO,CAChB,CAAA,CACF,CAAC;QAEF,iCAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;IAC1B,CAAC;CAAA;AAhBD,mCAgBC;AAED,SAAsB,QAAQ,CAC5B,WAAmB,EACnB,WAAmB,EACnB,aAAqB,EACrB,OAAgB;;QAEhB,MAAM,KAAK,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,kDAAsB,EAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE;YAC7B,WAAW,CAAC,YAAY,GAAG,EAAE,CAAC;YAC9B,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IAAI,WAAW,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;SAC9B;QAED,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACtB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;gBAClC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,OAAO,GAAG,IAAI,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,EAAE;YACX,IAAA,yBAAa,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC;SAC7C;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AApCD,4BAoCC;AAED,SAAgB,4BAA4B,CAC1C,WAAmB,EACnB,IAAc;IAEd,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,eAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAC5B,MAAM,CACP,yCAAyC,WAAW;IACrD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;KACjE;SAAM;QACL,eAAM,CAAC,IAAI,CACT,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAChB,MAAM,CACP,sBAAsB,WAAW,oCAAoC,CACvE,CAAC;KACH;AACH,CAAC;AAhBD,oEAgBC"}
@@ -20,7 +20,12 @@ export default async function* syncDepsExecutor(
20
20
  const projectRoot = context.workspace.projects[context.projectName].root;
21
21
  displayNewlyAddedDepsMessage(
22
22
  context.projectName,
23
- await syncDeps(context.projectName, projectRoot, options.include)
23
+ await syncDeps(
24
+ context.projectName,
25
+ projectRoot,
26
+ context.root,
27
+ options.include
28
+ )
24
29
  );
25
30
 
26
31
  yield { success: true };
@@ -29,11 +34,12 @@ export default async function* syncDepsExecutor(
29
34
  export async function syncDeps(
30
35
  projectName: string,
31
36
  projectRoot: string,
37
+ workspaceRoot: string,
32
38
  include?: string
33
39
  ): Promise<string[]> {
34
40
  const graph = await createProjectGraphAsync();
35
41
  const npmDeps = findAllNpmDependencies(graph, projectName);
36
- const packageJsonPath = join(projectRoot, 'package.json');
42
+ const packageJsonPath = join(workspaceRoot, projectRoot, 'package.json');
37
43
  const packageJson = readJsonFile(packageJsonPath);
38
44
  const newDeps = [];
39
45
  const includeDeps = include?.split(',');
@@ -24,10 +24,10 @@ function reactNativeApplicationGenerator(host, schema) {
24
24
  const lintTask = yield (0, add_linting_1.addLinting)(host, options.projectName, options.appProjectRoot, [(0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json')], options.linter, options.setParserOptionsProject);
25
25
  const jestTask = yield (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot);
26
26
  const detoxTask = yield (0, add_detox_1.addDetox)(host, options);
27
- const symlinkTask = (0, symlink_task_1.runSymlink)(options.appProjectRoot);
28
- const podInstallTask = (0, pod_install_task_1.runPodInstall)(options.iosProjectRoot);
29
- const chmodTaskGradlew = (0, chmod_task_1.runChmod)((0, path_1.join)(options.androidProjectRoot, 'gradlew'), 0o775);
30
- const chmodTaskGradlewBat = (0, chmod_task_1.runChmod)((0, path_1.join)(options.androidProjectRoot, 'gradlew.bat'), 0o775);
27
+ const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
28
+ const podInstallTask = (0, pod_install_task_1.runPodInstall)((0, path_1.join)(host.root, options.iosProjectRoot));
29
+ const chmodTaskGradlew = (0, chmod_task_1.runChmod)((0, path_1.join)(host.root, options.androidProjectRoot, 'gradlew'), 0o775);
30
+ const chmodTaskGradlewBat = (0, chmod_task_1.runChmod)((0, path_1.join)(host.root, options.androidProjectRoot, 'gradlew.bat'), 0o775);
31
31
  if (!options.skipFormat) {
32
32
  yield (0, devkit_1.formatFiles)(host);
33
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,2FAAqF;AAErF,mEAA6D;AAC7D,uDAAkD;AAClD,2DAAsD;AACtD,yDAAqD;AACrD,mDAA+C;AAC/C,yCAMsB;AACtB,+DAA2D;AAC3D,uCAAyC;AACzC,+BAA4B;AAC5B,mDAA+C;AAC/C,6EAAwE;AACxE,+CAA2C;AAE3C,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAc;;QAEd,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAa,EAAC,IAAI,kCAAO,OAAO,KAAE,UAAU,EAAE,IAAI,IAAG,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAC/B,IAAI,EACJ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,cAAc,EACtB,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,EAChE,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,uBAAuB,CAChC,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAO,EAC5B,IAAI,EACJ,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,IAAA,yBAAU,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC7D,MAAM,gBAAgB,GAAG,IAAA,qBAAQ,EAC/B,IAAA,WAAI,EAAC,OAAO,CAAC,kBAAkB,EAAE,SAAS,CAAC,EAC3C,KAAK,CACN,CAAC;QACF,MAAM,mBAAmB,GAAG,IAAA,qBAAQ,EAClC,IAAA,WAAI,EAAC,OAAO,CAAC,kBAAkB,EAAE,aAAa,CAAC,EAC/C,KAAK,CACN,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EACrB,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,mBAAmB,CACpB,CAAC;IACJ,CAAC;CAAA;AAlDD,0EAkDC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
1
+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,2FAAqF;AAErF,mEAA6D;AAC7D,uDAAkD;AAClD,2DAAsD;AACtD,yDAAqD;AACrD,mDAA+C;AAC/C,yCAMsB;AACtB,+DAA2D;AAC3D,uCAAyC;AACzC,+BAA4B;AAC5B,mDAA+C;AAC/C,6EAAwE;AACxE,+CAA2C;AAE3C,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAc;;QAEd,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAa,EAAC,IAAI,kCAAO,OAAO,KAAE,UAAU,EAAE,IAAI,IAAG,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAC/B,IAAI,EACJ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,cAAc,EACtB,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC,EAChE,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,uBAAuB,CAChC,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAO,EAC5B,IAAI,EACJ,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;QAC9E,MAAM,gBAAgB,GAAG,IAAA,qBAAQ,EAC/B,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,EAAE,SAAS,CAAC,EACtD,KAAK,CACN,CAAC;QACF,MAAM,mBAAmB,GAAG,IAAA,qBAAQ,EAClC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,EAAE,aAAa,CAAC,EAC1D,KAAK,CACN,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EACrB,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,mBAAmB,CACpB,CAAC;IACJ,CAAC;CAAA;AAlDD,0EAkDC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
@@ -18,7 +18,7 @@ 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)(host.root, appProjectRoot, options.js ? 'src/main.js' : '/src/main.tsx');
22
22
  /**
23
23
  * if options.name is "my-app"
24
24
  * 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'
@@ -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;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,EACpB,IAAI,CAAC,IAAI,EACT,cAAc,EACd,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAC7C,CAAC;IAEF;;;;;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;AAlDD,4CAkDC"}
@@ -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"}
@@ -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;
@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.runSymlink = void 0;
4
4
  const ensure_node_modules_symlink_1 = require("./ensure-node-modules-symlink");
5
5
  const chalk = require("chalk");
6
- const app_root_1 = require("@nrwl/workspace/src/utils/app-root");
7
6
  const devkit_1 = require("@nrwl/devkit");
8
- function runSymlink(projectRoot) {
7
+ function runSymlink(worksapceRoot, projectRoot) {
9
8
  return () => {
10
9
  devkit_1.logger.info(`creating symlinks for ${chalk.bold(projectRoot)}`);
11
10
  try {
12
- (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(app_root_1.appRootPath, projectRoot);
11
+ (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(worksapceRoot, projectRoot);
13
12
  }
14
13
  catch (_a) {
15
14
  throw new Error(`Failed to create symlinks for ${chalk.bold(projectRoot)}`);
@@ -1 +1 @@
1
- {"version":3,"file":"symlink-task.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/symlink-task.ts"],"names":[],"mappings":";;;AAAA,+EAAyE;AACzE,+BAA+B;AAC/B,iEAAiE;AACjE,yCAAyD;AAEzD,SAAgB,UAAU,CAAC,WAAmB;IAC5C,OAAO,GAAG,EAAE;QACV,eAAM,CAAC,IAAI,CAAC,yBAAyB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI;YACF,IAAA,sDAAwB,EAAC,sBAAW,EAAE,WAAW,CAAC,CAAC;SACpD;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CACb,iCAAiC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAC3D,CAAC;SACH;IACH,CAAC,CAAC;AACJ,CAAC;AAXD,gCAWC"}
1
+ {"version":3,"file":"symlink-task.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/symlink-task.ts"],"names":[],"mappings":";;;AAAA,+EAAyE;AACzE,+BAA+B;AAC/B,yCAAyD;AAEzD,SAAgB,UAAU,CACxB,aAAqB,EACrB,WAAmB;IAEnB,OAAO,GAAG,EAAE;QACV,eAAM,CAAC,IAAI,CAAC,yBAAyB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI;YACF,IAAA,sDAAwB,EAAC,aAAa,EAAE,WAAW,CAAC,CAAC;SACtD;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CACb,iCAAiC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAC3D,CAAC;SACH;IACH,CAAC,CAAC;AACJ,CAAC;AAdD,gCAcC"}
@@ -12,3 +12,4 @@ export declare const jestReactNativeVersion = "18.0.0";
12
12
  export declare const reactTestRendererVersion = "17.0.2";
13
13
  export declare const reactNativeSvgTransformerVersion = "0.14.3";
14
14
  export declare const reactNativeSvgVersion = "12.1.1";
15
+ export declare const babelRuntimeVersion = "7.16.3";
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.reactTestRendererVersion = exports.jestReactNativeVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.metroReactNativeBabelPresetVersion = exports.reactNativeCommunityCliAndroid = exports.reactNativeCommunityCliIos = exports.reactNativeCommunityCli = exports.metroVersion = exports.typesReactNativeVersion = exports.reactNativeVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '13.2.2';
3
+ exports.babelRuntimeVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.reactTestRendererVersion = exports.jestReactNativeVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.metroReactNativeBabelPresetVersion = exports.reactNativeCommunityCliAndroid = exports.reactNativeCommunityCliIos = exports.reactNativeCommunityCli = exports.metroVersion = exports.typesReactNativeVersion = exports.reactNativeVersion = exports.nxVersion = void 0;
4
+ exports.nxVersion = '13.3.0-beta.3';
5
5
  exports.reactNativeVersion = '0.66.2';
6
6
  exports.typesReactNativeVersion = '0.66.2';
7
7
  exports.metroVersion = '0.66.2';
@@ -15,4 +15,5 @@ exports.jestReactNativeVersion = '18.0.0';
15
15
  exports.reactTestRendererVersion = '17.0.2';
16
16
  exports.reactNativeSvgTransformerVersion = '0.14.3';
17
17
  exports.reactNativeSvgVersion = '12.1.1';
18
+ exports.babelRuntimeVersion = '7.16.3';
18
19
  //# sourceMappingURL=versions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AAEnC,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,8BAA8B,GAAG,OAAO,CAAC;AAEzC,QAAA,kCAAkC,GAAG,QAAQ,CAAC;AAE9C,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,+BAA+B,GAAG,OAAO,CAAC;AAE1C,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAElC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AAEpC,QAAA,gCAAgC,GAAG,QAAQ,CAAC;AAC5C,QAAA,qBAAqB,GAAG,QAAQ,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react-native/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AAEnC,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,8BAA8B,GAAG,OAAO,CAAC;AAEzC,QAAA,kCAAkC,GAAG,QAAQ,CAAC;AAE9C,QAAA,gCAAgC,GAAG,OAAO,CAAC;AAC3C,QAAA,+BAA+B,GAAG,OAAO,CAAC;AAE1C,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAElC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AAEpC,QAAA,gCAAgC,GAAG,QAAQ,CAAC;AAC5C,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAEjC,QAAA,mBAAmB,GAAG,QAAQ,CAAC"}