@nx/react-native 16.8.0-beta.3 → 16.8.0-beta.5

package/src/migrations/update-16-6-0/add-depends-on.js

@@ -1,43 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * This migration adds dependsOn to project.json.
  *
  */
-function update(tree) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [name, config] of projects.entries()) {
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a['start']) === null || _b === void 0 ? void 0 : _b.executor) === '@nx/react-native:start') {
-                config.targets['start'].dependsOn = [
-                    'ensure-symlink',
-                    'sync-deps',
-                    'pod-install',
-                ];
-                config.targets['run-ios'].dependsOn = [
-                    'ensure-symlink',
-                    'sync-deps',
-                    'pod-install',
-                ];
-                config.targets['bundle-ios'].dependsOn = ['ensure-symlink'];
-                config.targets['run-android'].dependsOn = ['ensure-symlink', 'sync-deps'];
-                config.targets['build-android'].dependsOn = [
-                    'ensure-symlink',
-                    'sync-deps',
-                ];
-                config.targets['build-ios'].dependsOn = [
-                    'ensure-symlink',
-                    'sync-deps',
-                    'pod-install',
-                ];
-                config.targets['pod-install'].dependsOn = ['ensure-symlink', 'sync-deps'];
-                config.targets['bundle-android'].dependsOn = ['ensure-symlink'];
-                (0, devkit_1.updateProjectConfiguration)(tree, name, config);
-            }
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [name, config] of projects.entries()) {
+        if (config.targets?.['start']?.executor === '@nx/react-native:start') {
+            config.targets['start'].dependsOn = [
+                'ensure-symlink',
+                'sync-deps',
+                'pod-install',
+            ];
+            config.targets['run-ios'].dependsOn = [
+                'ensure-symlink',
+                'sync-deps',
+                'pod-install',
+            ];
+            config.targets['bundle-ios'].dependsOn = ['ensure-symlink'];
+            config.targets['run-android'].dependsOn = ['ensure-symlink', 'sync-deps'];
+            config.targets['build-android'].dependsOn = [
+                'ensure-symlink',
+                'sync-deps',
+            ];
+            config.targets['build-ios'].dependsOn = [
+                'ensure-symlink',
+                'sync-deps',
+                'pod-install',
+            ];
+            config.targets['pod-install'].dependsOn = ['ensure-symlink', 'sync-deps'];
+            config.targets['bundle-android'].dependsOn = ['ensure-symlink'];
+            (0, devkit_1.updateProjectConfiguration)(tree, name, config);
         }
-    });
+    }
 }
 exports.default = update;

package/src/migrations/update-16-6-0/update-metro-config.js

@@ -1,28 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 /**
  * This migration updates metro.config.js to export config as a default.
  *
  */
-function update(tree) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        for (const [_, config] of projects.entries()) {
-            if (((_b = (_a = config.targets) === null || _a === void 0 ? void 0 : _a['start']) === null || _b === void 0 ? void 0 : _b.executor) === '@nx/react-native:start') {
-                if (tree.exists((0, path_1.join)(config.root, 'metro.config.js'))) {
-                    const oldConfig = tree
-                        .read((0, path_1.join)(config.root, 'metro.config.js'))
-                        .toString();
-                    tree.write((0, path_1.join)(config.root, 'metro-v71.config.js'), oldConfigComment + oldConfig);
-                    tree.write((0, path_1.join)(config.root, 'metro.config.js'), content);
-                }
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [_, config] of projects.entries()) {
+        if (config.targets?.['start']?.executor === '@nx/react-native:start') {
+            if (tree.exists((0, path_1.join)(config.root, 'metro.config.js'))) {
+                const oldConfig = tree
+                    .read((0, path_1.join)(config.root, 'metro.config.js'))
+                    .toString();
+                tree.write((0, path_1.join)(config.root, 'metro-v71.config.js'), oldConfigComment + oldConfig);
+                tree.write((0, path_1.join)(config.root, 'metro.config.js'), content);
             }
         }
-    });
+    }
 }
 exports.default = update;
 const oldConfigComment = `/**

package/src/utils/add-jest.js

@@ -1,27 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
-function addJest(host, unitTestRunner, projectName, appProjectRoot, js, skipPackageJson) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (unitTestRunner !== 'jest') {
-            return () => { };
-        }
-        const jestTask = yield (0, jest_1.configurationGenerator)(host, {
-            js,
-            project: projectName,
-            supportTsx: true,
-            skipSerializers: true,
-            setupFile: 'none',
-            compiler: 'babel',
-            skipPackageJson,
-            skipFormat: true,
-        });
-        // overwrite the jest.config.ts file because react native needs to have special transform property
-        const configPath = `${appProjectRoot}/jest.config.${js ? 'js' : 'ts'}`;
-        const content = `module.exports = {
+async function addJest(host, unitTestRunner, projectName, appProjectRoot, js, skipPackageJson) {
+    if (unitTestRunner !== 'jest') {
+        return () => { };
+    }
+    const jestTask = await (0, jest_1.configurationGenerator)(host, {
+        js,
+        project: projectName,
+        supportTsx: true,
+        skipSerializers: true,
+        setupFile: 'none',
+        compiler: 'babel',
+        skipPackageJson,
+        skipFormat: true,
+    });
+    // overwrite the jest.config.ts file because react native needs to have special transform property
+    const configPath = `${appProjectRoot}/jest.config.${js ? 'js' : 'ts'}`;
+    const content = `module.exports = {
   displayName: '${projectName}',
   preset: 'react-native',
   resolver: '@nx/jest/plugins/resolver',
@@ -32,8 +30,7 @@ function addJest(host, unitTestRunner, projectName, appProjectRoot, js, skipPack
   },
   coverageDirectory: '${(0, devkit_1.offsetFromRoot)(appProjectRoot)}coverage/${appProjectRoot}'
 };`;
-        host.write(configPath, content);
-        return jestTask;
-    });
+    host.write(configPath, content);
+    return jestTask;
 }
 exports.addJest = addJest;

package/src/utils/add-linting.js

@@ -1,39 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = void 0;
-const tslib_1 = require("tslib");
 const linter_1 = require("@nx/linter");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("@nx/react/src/utils/lint");
 const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
-function addLinting(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.linter === linter_1.Linter.None) {
-            return () => { };
-        }
-        const tasks = [];
-        const lintTask = yield (0, linter_1.lintProjectGenerator)(host, {
-            linter: options.linter,
-            project: options.projectName,
-            tsConfigPaths: options.tsConfigPaths,
-            eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
-            skipFormat: true,
-            skipPackageJson: options.skipPackageJson,
-        });
-        tasks.push(lintTask);
-        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-            (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, 'plugin:@nx/react');
-            (0, eslint_file_1.addIgnoresToLintConfig)(host, options.projectRoot, [
-                'public',
-                '.cache',
-                'node_modules',
-            ]);
-        }
-        if (!options.skipPackageJson) {
-            const installTask = yield (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
-            tasks.push(installTask);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function addLinting(host, options) {
+    if (options.linter === linter_1.Linter.None) {
+        return () => { };
+    }
+    const tasks = [];
+    const lintTask = await (0, linter_1.lintProjectGenerator)(host, {
+        linter: options.linter,
+        project: options.projectName,
+        tsConfigPaths: options.tsConfigPaths,
+        eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
+        skipFormat: true,
+        skipPackageJson: options.skipPackageJson,
     });
+    tasks.push(lintTask);
+    if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
+        (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, 'plugin:@nx/react');
+        (0, eslint_file_1.addIgnoresToLintConfig)(host, options.projectRoot, [
+            'public',
+            '.cache',
+            'node_modules',
+        ]);
+    }
+    if (!options.skipPackageJson) {
+        const installTask = await (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
+        tasks.push(installTask);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.addLinting = addLinting;

package/src/utils/chmod-android-gradle-files.js

@@ -15,7 +15,7 @@ function chmodAndroidGradlewFilesTask(androidFolder) {
         try {
             chmodAndroidGradlewFiles(androidFolder);
         }
-        catch (_a) {
+        catch {
             throw new Error(`chmod failed gradlew file under ${androidFolder}`);
         }
     };

package/src/utils/find-all-npm-dependencies.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAllNpmDependencies = void 0;
 function findAllNpmDependencies(graph, projectName, list = [], seen = new Set()) {
-    var _a;
     // In case of bad circular dependencies
     if (seen.has(projectName)) {
         return list;
@@ -19,7 +18,7 @@ function findAllNpmDependencies(graph, projectName, list = [], seen = new Set())
     }
     else {
         // it's workspace project, search for it's dependencies
-        (_a = graph.dependencies[projectName]) === null || _a === void 0 ? void 0 : _a.forEach((dep) => findAllNpmDependencies(graph, dep.target, list, seen));
+        graph.dependencies[projectName]?.forEach((dep) => findAllNpmDependencies(graph, dep.target, list, seen));
     }
     return list;
 }

package/src/utils/symlink-task.js

@@ -10,7 +10,7 @@ function runSymlink(workspaceRoot, projectRoot) {
         try {
             (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(workspaceRoot, projectRoot);
         }
-        catch (_a) {
+        catch {
             throw new Error(`Failed to create symlinks for ${chalk.bold(projectRoot)}`);
         }
     };

package/src/utils/testing-generators.js

@@ -1,35 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLib = exports.createApp = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const application_1 = require("../generators/application/application");
 const linter_1 = require("@nx/linter");
-function createApp(tree, appName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, application_1.default)(tree, {
-            linter: linter_1.Linter.EsLint,
-            skipFormat: true,
-            style: 'css',
-            unitTestRunner: 'none',
-            name: appName,
-            e2eTestRunner: 'none',
-            install: false,
-        });
+async function createApp(tree, appName) {
+    await (0, application_1.default)(tree, {
+        linter: linter_1.Linter.EsLint,
+        skipFormat: true,
+        style: 'css',
+        unitTestRunner: 'none',
+        name: appName,
+        e2eTestRunner: 'none',
+        install: false,
+        projectNameAndRootFormat: 'as-provided',
     });
 }
 exports.createApp = createApp;
-function createLib(tree, libName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { fileName } = (0, devkit_1.names)(libName);
-        tree.write(`/libs/${fileName}/src/index.ts`, `import React from 'react';\n`);
-        (0, devkit_1.addProjectConfiguration)(tree, fileName, {
-            tags: [],
-            root: `libs/${fileName}`,
-            projectType: 'library',
-            sourceRoot: `libs/${fileName}/src`,
-            targets: {},
-        });
+async function createLib(tree, libName) {
+    const { fileName } = (0, devkit_1.names)(libName);
+    tree.write(`${fileName}/src/index.ts`, `import React from 'react';\n`);
+    (0, devkit_1.addProjectConfiguration)(tree, fileName, {
+        tags: [],
+        root: `${fileName}`,
+        projectType: 'library',
+        sourceRoot: `${fileName}/src`,
+        targets: {},
     });
 }
 exports.createLib = createLib;