@nrwl/react-native 13.3.0-beta.1 → 13.3.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react-native",
-  "version": "13.3.0-beta.1",
+  "version": "13.3.0-beta.8",
   "description": "React Native Plugin for Nx",
   "keywords": [
     "Monorepo",
@@ -24,13 +24,14 @@
   "main": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nrwl/detox": "13.3.0-beta.1",
-    "@nrwl/devkit": "13.3.0-beta.1",
-    "@nrwl/jest": "13.3.0-beta.1",
-    "@nrwl/linter": "13.3.0-beta.1",
-    "@nrwl/react": "13.3.0-beta.1",
-    "@nrwl/workspace": "13.3.0-beta.1",
+    "@nrwl/detox": "13.3.0-beta.8",
+    "@nrwl/devkit": "13.3.0-beta.8",
+    "@nrwl/jest": "13.3.0-beta.8",
+    "@nrwl/linter": "13.3.0-beta.8",
+    "@nrwl/react": "13.3.0-beta.8",
+    "@nrwl/workspace": "13.3.0-beta.8",
     "chalk": "^4.1.0",
+    "enhanced-resolve": "^5.8.3",
     "ignore": "^5.0.4",
     "metro-resolver": "^0.66.2",
     "node-fetch": "^2.6.1",

package/plugins/metro-resolver.js

@@ -5,6 +5,11 @@ const tslib_1 = require("tslib");
 const metroResolver = require("metro-resolver");
 const tsconfig_paths_1 = require("tsconfig-paths");
 const chalk = require("chalk");
+const devkit_1 = require("@nrwl/devkit");
+const enhanced_resolve_1 = require("enhanced-resolve");
+const path_1 = require("path");
+const fs = require("fs");
+const app_root_1 = require("@nrwl/tao/src/utils/app-root");
 /*
  * Use tsconfig to resolve additional workspace libs.
  *
@@ -17,37 +22,83 @@ function getResolveRequest(extensions) {
         if (DEBUG)
             console.log(chalk.cyan(`[Nx] Resolving: ${moduleName}`));
         const { resolveRequest } = _context, context = (0, tslib_1.__rest)(_context, ["resolveRequest"]);
-        try {
-            return metroResolver.resolve(context, moduleName, platform);
+        let resolvedPath = defaultMetroResolver(context, moduleName, platform);
+        if (resolvedPath) {
+            return resolvedPath;
         }
-        catch (_a) {
-            if (DEBUG)
-                console.log(chalk.cyan(`[Nx] Unable to resolve with default Metro resolver: ${moduleName}`));
-        }
-        const matcher = getMatcher();
-        let match;
-        const matchExtension = extensions.find((extension) => {
-            match = matcher(realModuleName, undefined, undefined, ['.' + extension]);
-            return !!match;
-        });
-        if (match) {
-            return {
-                type: 'sourceFile',
-                filePath: !matchExtension || match.endsWith(`.${matchExtension}`)
-                    ? match
-                    : `${match}.${matchExtension}`,
-            };
-        }
-        else {
-            if (DEBUG) {
-                console.log(chalk.red(`[Nx] Failed to resolve ${chalk.bold(moduleName)}`));
-                console.log(chalk.cyan(`[Nx] The following tsconfig paths was used:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
+        if ((0, devkit_1.detectPackageManager)(app_root_1.appRootPath) === 'pnpm') {
+            resolvedPath = pnpmResolver(extensions, context, realModuleName, moduleName);
+            if (resolvedPath) {
+                return resolvedPath;
             }
-            throw new Error(`Cannot resolve ${chalk.bold(moduleName)}`);
         }
+        return tsconfigPathsResolver(extensions, realModuleName, moduleName);
     };
 }
 exports.getResolveRequest = getResolveRequest;
+/**
+ * This function try to resolve path using metro's default resolver
+ * @returns path if resolved, else undefined
+ */
+function defaultMetroResolver(context, moduleName, platform) {
+    const DEBUG = process.env.NX_REACT_NATIVE_DEBUG === 'true';
+    try {
+        return metroResolver.resolve(context, moduleName, platform);
+    }
+    catch (_a) {
+        if (DEBUG)
+            console.log(chalk.cyan(`[Nx] Unable to resolve with default Metro resolver: ${moduleName}`));
+    }
+}
+/**
+ * This resolver try to resolve module for pnpm.
+ * @returns path if resolved, else undefined
+ * This pnpm resolver is inspired from https://github.com/vjpr/pnpm-react-native-example/blob/main/packages/pnpm-expo-helper/util/make-resolver.js
+ */
+function pnpmResolver(extensions, context, realModuleName, moduleName) {
+    const DEBUG = process.env.NX_REACT_NATIVE_DEBUG === 'true';
+    try {
+        const pnpmResolver = getPnpmResolver(app_root_1.appRootPath, extensions);
+        const lookupStartPath = (0, path_1.dirname)(context.originModulePath);
+        const filePath = pnpmResolver.resolveSync({}, lookupStartPath, realModuleName);
+        if (filePath) {
+            return { type: 'sourceFile', filePath };
+        }
+    }
+    catch (_a) {
+        if (DEBUG)
+            console.log(chalk.cyan(`[Nx] Unable to resolve with default PNPM resolver: ${moduleName}`));
+    }
+}
+/**
+ * This function try to resolve files that are specified in tsconfig's paths
+ * @returns path if resolved, else undefined
+ */
+function tsconfigPathsResolver(extensions, realModuleName, moduleName) {
+    const DEBUG = process.env.NX_REACT_NATIVE_DEBUG === 'true';
+    const matcher = getMatcher();
+    let match;
+    // find out the file extension
+    const matchExtension = extensions.find((extension) => {
+        match = matcher(realModuleName, undefined, undefined, ['.' + extension]);
+        return !!match;
+    });
+    if (match) {
+        return {
+            type: 'sourceFile',
+            filePath: !matchExtension || match.endsWith(`.${matchExtension}`)
+                ? match
+                : `${match}.${matchExtension}`,
+        };
+    }
+    else {
+        if (DEBUG) {
+            console.log(chalk.red(`[Nx] Failed to resolve ${chalk.bold(moduleName)}`));
+            console.log(chalk.cyan(`[Nx] The following tsconfig paths was used:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
+        }
+        throw new Error(`Cannot resolve ${chalk.bold(moduleName)}`);
+    }
+}
 let matcher;
 let absoluteBaseUrl;
 let paths;
@@ -71,4 +122,21 @@ function getMatcher() {
     }
     return matcher;
 }
+/**
+ * This function returns resolver for pnpm.
+ * It is inspired form https://github.com/vjpr/pnpm-expo-example/blob/main/packages/pnpm-expo-helper/util/make-resolver.js.
+ */
+let resolver;
+function getPnpmResolver(appRootPath, extensions) {
+    if (!resolver) {
+        const fileSystem = new enhanced_resolve_1.CachedInputFileSystem(fs, 4000);
+        resolver = enhanced_resolve_1.ResolverFactory.createResolver({
+            fileSystem,
+            extensions: extensions.map((extension) => '.' + extension),
+            useSyncFileSystemCalls: true,
+            modules: [(0, path_1.join)(appRootPath, 'node_modules'), 'node_modules'],
+        });
+    }
+    return resolver;
+}
 //# sourceMappingURL=metro-resolver.js.map

package/plugins/metro-resolver.js.map

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

package/plugins/with-nx-metro.js

@@ -4,7 +4,7 @@ exports.withNxMetro = void 0;
 const app_root_1 = require("@nrwl/workspace/src/utils/app-root");
 const metro_resolver_1 = require("./metro-resolver");
 function withNxMetro(config, opts = {}) {
-    const extensions = ['', 'ts', 'tsx', 'js', 'jsx'];
+    const extensions = ['', 'ts', 'tsx', 'js', 'jsx', 'json'];
     if (opts.debug)
         process.env.NX_REACT_NATIVE_DEBUG = 'true';
     if (opts.extensions)

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

@@ -1 +1 @@
-{"version":3,"file":"with-nx-metro.js","sourceRoot":"","sources":["../../../../packages/react-native/plugins/with-nx-metro.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AACjE,qDAAqD;AAOrD,SAAgB,WAAW,CAAC,MAAW,EAAE,OAAsB,EAAE;IAC/D,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAClD,IAAI,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,MAAM,CAAC;IAC3D,IAAI,IAAI,CAAC,UAAU;QAAE,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IAEzD,sEAAsE;IACtE,MAAM,CAAC,WAAW,GAAG,sBAAW,CAAC;IAEjC,8CAA8C;IAC9C,MAAM,CAAC,QAAQ,mCACV,MAAM,CAAC,QAAQ,KAClB,cAAc,EAAE,IAAA,kCAAiB,EAAC,UAAU,CAAC,GAC9C,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAfD,kCAeC"}
+{"version":3,"file":"with-nx-metro.js","sourceRoot":"","sources":["../../../../packages/react-native/plugins/with-nx-metro.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AACjE,qDAAqD;AAOrD,SAAgB,WAAW,CAAC,MAAW,EAAE,OAAsB,EAAE;IAC/D,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC1D,IAAI,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,MAAM,CAAC;IAC3D,IAAI,IAAI,CAAC,UAAU;QAAE,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC;IAEzD,sEAAsE;IACtE,MAAM,CAAC,WAAW,GAAG,sBAAW,CAAC;IAEjC,8CAA8C;IAC9C,MAAM,CAAC,QAAQ,mCACV,MAAM,CAAC,QAAQ,KAClB,cAAc,EAAE,IAAA,kCAAiB,EAAC,UAAU,CAAC,GAC9C,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAfD,kCAeC"}

package/project.json

@@ -26,13 +26,11 @@
       "outputs": ["coverage/packages/react-native"]
     },
     "build-base": {
-      "executor": "@nrwl/node:package",
+      "executor": "@nrwl/js:tsc",
       "options": {
         "outputPath": "build/packages/react-native",
         "tsConfig": "packages/react-native/tsconfig.lib.json",
-        "packageJson": "packages/react-native/package.json",
         "main": "packages/react-native/index.ts",
-        "updateBuildableProjectDepsInPackageJson": false,
         "assets": [
           "packages/react-native/*.md",
           {

package/src/executors/build-android/build-android.impl.js

@@ -13,7 +13,7 @@ function buildAndroidExecutor(options, context) {
         (0, fs_1.chmodSync)((0, path_1.join)(projectRoot, 'android', 'gradlew'), 0o775);
         (0, fs_1.chmodSync)((0, path_1.join)(projectRoot, 'android', 'gradlew.bat'), 0o775);
         try {
-            yield (0, tslib_1.__await)(runCliBuild(projectRoot, options));
+            yield (0, tslib_1.__await)(runCliBuild(context.root, projectRoot, options));
             yield yield (0, tslib_1.__await)({ success: true });
         }
         finally {
@@ -24,10 +24,10 @@ function buildAndroidExecutor(options, context) {
     });
 }
 exports.default = buildAndroidExecutor;
-function runCliBuild(projectRoot, options) {
+function runCliBuild(workspaceRoot, projectRoot, options) {
     return new Promise((resolve, reject) => {
         childProcess = (0, child_process_1.spawn)(process.platform === 'win32' ? 'gradlew.bat' : './gradlew', [options.apk ? 'assembleRelease' : 'bundleRelease'], {
-            cwd: (0, path_1.join)(projectRoot, 'android'),
+            cwd: (0, path_1.join)(workspaceRoot, projectRoot, 'android'),
             stdio: [0, 1, 2],
         });
         // Ensure the child process is killed when the parent exits

package/src/executors/build-android/build-android.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-android.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/build-android/build-android.impl.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,yFAAmF;AACnF,iDAAoD;AACpD,2BAA+B;AAM/B,IAAI,YAA0B,CAAC;AAE/B,SAA+B,oBAAoB,CACjD,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;QACpD,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;QAC1D,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,KAAK,CAAC,CAAC;QAE9D,IAAI;YACF,2BAAM,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YACxC,iCAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAjBD,uCAiBC;AAED,SAAS,WAAW,CAAC,WAAmB,EAAE,OAAgC;IACxE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,qBAAK,EAClB,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,EAC1D,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,EACnD;YACE,GAAG,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,SAAS,CAAC;YACjC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CACF,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"}
+{"version":3,"file":"build-android.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/build-android/build-android.impl.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,yFAAmF;AACnF,iDAAoD;AACpD,2BAA+B;AAM/B,IAAI,YAA0B,CAAC;AAE/B,SAA+B,oBAAoB,CACjD,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;QACpD,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;QAC1D,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,KAAK,CAAC,CAAC;QAE9D,IAAI;YACF,2BAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YACtD,iCAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAjBD,uCAiBC;AAED,SAAS,WAAW,CAClB,aAAqB,EACrB,WAAmB,EACnB,OAAgC;IAEhC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,qBAAK,EAClB,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,EAC1D,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,EACnD;YACE,GAAG,EAAE,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,EAAE,SAAS,CAAC;YAChD,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CACF,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"}

package/src/executors/build-android/build-android.impl.ts

@@ -20,7 +20,7 @@ export default async function* buildAndroidExecutor(
   chmodSync(join(projectRoot, 'android', 'gradlew.bat'), 0o775);
 
   try {
-    await runCliBuild(projectRoot, options);
+    await runCliBuild(context.root, projectRoot, options);
     yield { success: true };
   } finally {
     if (childProcess) {
@@ -29,13 +29,17 @@ export default async function* buildAndroidExecutor(
   }
 }
 
-function runCliBuild(projectRoot: string, options: ReactNativeBuildOptions) {
+function runCliBuild(
+  workspaceRoot: string,
+  projectRoot: string,
+  options: ReactNativeBuildOptions
+) {
   return new Promise((resolve, reject) => {
     childProcess = spawn(
       process.platform === 'win32' ? 'gradlew.bat' : './gradlew',
       [options.apk ? 'assembleRelease' : 'bundleRelease'],
       {
-        cwd: join(projectRoot, 'android'),
+        cwd: join(workspaceRoot, projectRoot, 'android'),
         stdio: [0, 1, 2],
       }
     );

package/src/executors/bundle/bundle.impl.js

@@ -10,12 +10,8 @@ let childProcess;
 function bundleExecutor(options, context) {
     return (0, tslib_1.__asyncGenerator)(this, arguments, function* bundleExecutor_1() {
         const projectRoot = context.workspace.projects[context.projectName].root;
-        options.bundleOutput = (0, path_1.relative)(context.root, projectRoot)
-            .split(path_1.sep)
-            .map(() => '..')
-            .concat(options.bundleOutput)
-            .join(path_1.sep);
-        (0, fileutils_1.createDirectory)((0, path_1.dirname)((0, path_1.join)(projectRoot, options.bundleOutput)));
+        options.bundleOutput = (0, path_1.join)(context.root, options.bundleOutput);
+        (0, fileutils_1.createDirectory)((0, path_1.dirname)(options.bundleOutput));
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
         try {
             yield (0, tslib_1.__await)(runCliBuild(context.root, projectRoot, options));
@@ -32,7 +28,7 @@ exports.default = bundleExecutor;
 function runCliBuild(workspaceRoot, projectRoot, options) {
     return new Promise((resolve, reject) => {
         const cliOptions = createBundleOptions(options);
-        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['bundle', ...cliOptions], { cwd: projectRoot });
+        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['bundle', ...cliOptions], { cwd: (0, path_1.join)(workspaceRoot, projectRoot) });
         // Ensure the child process is killed when the parent exits
         process.on('exit', () => childProcess.kill());
         process.on('SIGTERM', () => childProcess.kill());

package/src/executors/bundle/bundle.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/bundle/bundle.impl.ts"],"names":[],"mappings":";;;AAAA,uEAA0E;AAC1E,yEAAiE;AACjE,+BAAoD;AACpD,yFAAmF;AACnF,iDAAmD;AAQnD,IAAI,YAA0B,CAAC;AAE/B,SAA+B,cAAc,CAC3C,OAAiC,EACjC,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QAEzE,OAAO,CAAC,YAAY,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC;aACvD,KAAK,CAAC,UAAG,CAAC;aACV,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;aACf,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;aAC5B,IAAI,CAAC,UAAG,CAAC,CAAC;QAEb,IAAA,2BAAe,EAAC,IAAA,cAAO,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,2BAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YACtD,iCAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAvBD,iCAuBC;AAED,SAAS,WAAW,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO;IACtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAChD,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,oCAAoC,CAAC,EACzD,CAAC,QAAQ,EAAE,GAAG,UAAU,CAAC,EACzB,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,mBAAmB,CAAC,OAAO;IAClC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;QAC7C,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,IAAA,4BAAU,EAAC,EAAE,CAAC,CAAC;QACzB,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,GAAG,CAAC;QAChC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACtB,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"bundle.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/bundle/bundle.impl.ts"],"names":[],"mappings":";;;AAAA,uEAA0E;AAC1E,yEAAiE;AACjE,+BAAoD;AACpD,yFAAmF;AACnF,iDAAmD;AAQnD,IAAI,YAA0B,CAAC;AAE/B,SAA+B,cAAc,CAC3C,OAAiC,EACjC,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QAEzE,OAAO,CAAC,YAAY,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAEhE,IAAA,2BAAe,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;QAC/C,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,2BAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YACtD,iCAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAnBD,iCAmBC;AAED,SAAS,WAAW,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO;IACtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAChD,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,oCAAoC,CAAC,EACzD,CAAC,QAAQ,EAAE,GAAG,UAAU,CAAC,EACzB,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,mBAAmB,CAAC,OAAO;IAClC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;QAC7C,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,IAAA,4BAAU,EAAC,EAAE,CAAC,CAAC;QACzB,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,GAAG,CAAC;QAChC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACtB,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

package/src/executors/bundle/bundle.impl.ts

@@ -18,13 +18,9 @@ export default async function* bundleExecutor(
 ): AsyncGenerator<ReactNativeBundleOutput> {
   const projectRoot = context.workspace.projects[context.projectName].root;
 
-  options.bundleOutput = relative(context.root, projectRoot)
-    .split(sep)
-    .map(() => '..')
-    .concat(options.bundleOutput)
-    .join(sep);
+  options.bundleOutput = join(context.root, options.bundleOutput);
 
-  createDirectory(dirname(join(projectRoot, options.bundleOutput)));
+  createDirectory(dirname(options.bundleOutput));
   ensureNodeModulesSymlink(context.root, projectRoot);
 
   try {
@@ -43,7 +39,7 @@ function runCliBuild(workspaceRoot, projectRoot, options) {
     childProcess = fork(
       join(workspaceRoot, './node_modules/react-native/cli.js'),
       ['bundle', ...cliOptions],
-      { cwd: projectRoot }
+      { cwd: join(workspaceRoot, projectRoot) }
     );
 
     // Ensure the child process is killed when the parent exits

package/src/executors/run-android/run-android.impl.js

@@ -12,15 +12,18 @@ function runAndroidExecutor(options, context) {
     return (0, tslib_1.__asyncGenerator)(this, arguments, function* runAndroidExecutor_1() {
         const projectRoot = context.workspace.projects[context.projectName].root;
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
-        (0, fs_1.chmodSync)((0, path_1.join)(projectRoot, 'android', 'gradlew'), 0o775);
-        (0, fs_1.chmodSync)((0, path_1.join)(projectRoot, 'android', 'gradlew.bat'), 0o775);
+        (0, fs_1.chmodSync)((0, path_1.join)(context.root, projectRoot, 'android', 'gradlew'), 0o775);
+        (0, fs_1.chmodSync)((0, path_1.join)(context.root, projectRoot, 'android', 'gradlew.bat'), 0o775);
         if (options.sync) {
-            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield (0, tslib_1.__await)((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot)));
+            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield (0, tslib_1.__await)((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root)));
         }
         try {
             const tasks = [runCliRunAndroid(context.root, projectRoot, options)];
             if (options.packager) {
-                tasks.push((0, start_impl_1.runCliStart)(context.root, projectRoot, { port: options.port }));
+                tasks.push((0, start_impl_1.runCliStart)(context.root, projectRoot, {
+                    port: options.port,
+                    resetCache: options.resetCache,
+                }));
             }
             yield (0, tslib_1.__await)(Promise.all(tasks));
             yield yield (0, tslib_1.__await)({ success: true });
@@ -40,7 +43,7 @@ function runCliRunAndroid(workspaceRoot, projectRoot, options) {
          * Not passing '--packager' due to cli will launch start command from the project root
          */
         childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['run-android', ...createRunAndroidOptions(options), '--no-packager'], {
-            cwd: projectRoot,
+            cwd: (0, path_1.join)(workspaceRoot, projectRoot),
             env: Object.assign(Object.assign({}, process.env), { RCT_METRO_PORT: options.port.toString() }),
         });
         // Ensure the child process is killed when the parent exits
@@ -59,7 +62,7 @@ function runCliRunAndroid(workspaceRoot, projectRoot, options) {
         });
     });
 }
-const nxOptions = ['sync', 'install', 'packager'];
+const nxOrStartOptions = ['sync', 'install', 'packager', 'port', 'resetCache'];
 function createRunAndroidOptions(options) {
     return Object.keys(options).reduce((acc, k) => {
         const v = options[k];
@@ -71,7 +74,7 @@ function createRunAndroidOptions(options) {
                 acc.push(`--no-jetifier`);
             }
         }
-        else if (v && !nxOptions.includes(k)) {
+        else if (v && !nxOrStartOptions.includes(k)) {
             acc.push(`--${k}`, v);
         }
         return acc;

package/src/executors/run-android/run-android.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-android.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/run-android/run-android.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-android.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/run-android/run-android.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/run-android/run-android.impl.ts

@@ -23,13 +23,13 @@ export default async function* runAndroidExecutor(
 ): AsyncGenerator<ReactNativeRunAndroidOutput> {
   const projectRoot = context.workspace.projects[context.projectName].root;
   ensureNodeModulesSymlink(context.root, projectRoot);
-  chmodSync(join(projectRoot, 'android', 'gradlew'), 0o775);
-  chmodSync(join(projectRoot, 'android', 'gradlew.bat'), 0o775);
+  chmodSync(join(context.root, projectRoot, 'android', 'gradlew'), 0o775);
+  chmodSync(join(context.root, projectRoot, 'android', 'gradlew.bat'), 0o775);
 
   if (options.sync) {
     displayNewlyAddedDepsMessage(
       context.projectName,
-      await syncDeps(context.projectName, projectRoot)
+      await syncDeps(context.projectName, projectRoot, context.root)
     );
   }
 
@@ -37,7 +37,10 @@ export default async function* runAndroidExecutor(
     const tasks = [runCliRunAndroid(context.root, projectRoot, options)];
     if (options.packager) {
       tasks.push(
-        runCliStart(context.root, projectRoot, { port: options.port })
+        runCliStart(context.root, projectRoot, {
+          port: options.port,
+          resetCache: options.resetCache,
+        })
       );
     }
 
@@ -65,7 +68,7 @@ function runCliRunAndroid(
       join(workspaceRoot, './node_modules/react-native/cli.js'),
       ['run-android', ...createRunAndroidOptions(options), '--no-packager'],
       {
-        cwd: projectRoot,
+        cwd: join(workspaceRoot, projectRoot),
         env: { ...process.env, RCT_METRO_PORT: options.port.toString() },
       }
     );
@@ -87,7 +90,7 @@ function runCliRunAndroid(
   });
 }
 
-const nxOptions = ['sync', 'install', 'packager'];
+const nxOrStartOptions = ['sync', 'install', 'packager', 'port', 'resetCache'];
 
 function createRunAndroidOptions(options) {
   return Object.keys(options).reduce((acc, k) => {
@@ -98,7 +101,7 @@ function createRunAndroidOptions(options) {
       if (!v) {
         acc.push(`--no-jetifier`);
       }
-    } else if (v && !nxOptions.includes(k)) {
+    } else if (v && !nxOrStartOptions.includes(k)) {
       acc.push(`--${k}`, v);
     }
     return acc;

package/src/executors/run-android/schema.d.ts

@@ -11,4 +11,5 @@ export interface ReactNativeRunAndroidOptions {
   port: number;
   terminal?: string;
   packager: boolean;
+  resetCache?: boolean;
 }

package/src/executors/run-android/schema.json

@@ -55,6 +55,11 @@
       "type": "boolean",
       "description": "Starts the packager server",
       "default": true
+    },
+    "resetCache": {
+      "type": "boolean",
+      "description": "Resets metro cache",
+      "default": false
     }
   }
 }

package/src/executors/run-ios/run-ios.impl.js

@@ -17,15 +17,18 @@ function runIosExecutor(options, context) {
         const projectRoot = context.workspace.projects[context.projectName].root;
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
         if (options.sync) {
-            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield (0, tslib_1.__await)((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot)));
+            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield (0, tslib_1.__await)((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root)));
         }
         if (options.install) {
-            yield (0, tslib_1.__await)((0, pod_install_task_1.podInstall)((0, path_1.join)(projectRoot, 'ios')));
+            yield (0, tslib_1.__await)((0, pod_install_task_1.podInstall)((0, path_1.join)(context.root, projectRoot, 'ios')));
         }
         try {
             const tasks = [runCliRunIOS(context.root, projectRoot, options)];
             if (options.packager && options.xcodeConfiguration !== 'Release') {
-                tasks.push((0, start_impl_1.runCliStart)(context.root, projectRoot, { port: options.port }));
+                tasks.push((0, start_impl_1.runCliStart)(context.root, projectRoot, {
+                    port: options.port,
+                    resetCache: options.resetCache,
+                }));
             }
             yield (0, tslib_1.__await)(Promise.all(tasks));
             yield yield (0, tslib_1.__await)({ success: true });
@@ -45,7 +48,7 @@ function runCliRunIOS(workspaceRoot, projectRoot, options) {
          * Not passing '--packager' due to cli will launch start command from the project root
          */
         childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/react-native/cli.js'), ['run-ios', ...createRunIOSOptions(options), '--no-packager'], {
-            cwd: projectRoot,
+            cwd: (0, path_1.join)(workspaceRoot, projectRoot),
             env: Object.assign(Object.assign({}, process.env), { RCT_METRO_PORT: options.port.toString() }),
         });
         // Ensure the child process is killed when the parent exits
@@ -64,14 +67,14 @@ function runCliRunIOS(workspaceRoot, projectRoot, options) {
         });
     });
 }
-const nxOptions = ['sync', 'install', 'packager'];
+const nxOrStartOptions = ['sync', 'install', 'packager', 'port', 'resetCache'];
 function createRunIOSOptions(options) {
     return Object.keys(options).reduce((acc, k) => {
         const v = options[k];
         if (k === 'xcodeConfiguration') {
             acc.push('--configuration', v);
         }
-        else if (v && !nxOptions.includes(k)) {
+        else if (v && !nxOrStartOptions.includes(k)) {
             acc.push(`--${k}`, options[k]);
         }
         return acc;

package/src/executors/run-ios/run-ios.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-ios.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/run-ios/run-ios.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-ios.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/run-ios/run-ios.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/run-ios/run-ios.impl.ts

@@ -30,18 +30,21 @@ export default async function* runIosExecutor(
   if (options.sync) {
     displayNewlyAddedDepsMessage(
       context.projectName,
-      await syncDeps(context.projectName, projectRoot)
+      await syncDeps(context.projectName, projectRoot, context.root)
     );
   }
   if (options.install) {
-    await podInstall(join(projectRoot, 'ios'));
+    await podInstall(join(context.root, projectRoot, 'ios'));
   }
 
   try {
     const tasks = [runCliRunIOS(context.root, projectRoot, options)];
     if (options.packager && options.xcodeConfiguration !== 'Release') {
       tasks.push(
-        runCliStart(context.root, projectRoot, { port: options.port })
+        runCliStart(context.root, projectRoot, {
+          port: options.port,
+          resetCache: options.resetCache,
+        })
       );
     }
 
@@ -69,7 +72,7 @@ function runCliRunIOS(
       join(workspaceRoot, './node_modules/react-native/cli.js'),
       ['run-ios', ...createRunIOSOptions(options), '--no-packager'],
       {
-        cwd: projectRoot,
+        cwd: join(workspaceRoot, projectRoot),
         env: { ...process.env, RCT_METRO_PORT: options.port.toString() },
       }
     );
@@ -91,14 +94,14 @@ function runCliRunIOS(
   });
 }
 
-const nxOptions = ['sync', 'install', 'packager'];
+const nxOrStartOptions = ['sync', 'install', 'packager', 'port', 'resetCache'];
 
 function createRunIOSOptions(options) {
   return Object.keys(options).reduce((acc, k) => {
     const v = options[k];
     if (k === 'xcodeConfiguration') {
       acc.push('--configuration', v);
-    } else if (v && !nxOptions.includes(k)) {
+    } else if (v && !nxOrStartOptions.includes(k)) {
       acc.push(`--${k}`, options[k]);
     }
     return acc;

package/src/executors/run-ios/schema.d.ts

@@ -9,4 +9,5 @@ export interface ReactNativeRunIosOptions {
   install?: boolean;
   sync?: boolean;
   terminal?: string;
+  resetCache?: boolean;
 }

package/src/executors/run-ios/schema.json

@@ -47,6 +47,11 @@
       "type": "boolean",
       "description": "Starts the packager server",
       "default": true
+    },
+    "resetCache": {
+      "type": "boolean",
+      "description": "Resets metro cache",
+      "default": false
     }
   }
 }