@nx/react-native 16.8.0-beta.4 → 16.8.0-beta.6

package/src/generators/stories/stories-lib.spec.ts

@@ -27,14 +27,10 @@ describe('react-native:stories for libraries', () => {
     });
 
     expect(
-      appTree.exists(
-        'libs/test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx'
-      )
+      appTree.exists('test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx')
     ).toBeTruthy();
     expect(
-      appTree.exists(
-        'libs/test-ui-lib/src/lib/another-cmp/another-cmp.stories.tsx'
-      )
+      appTree.exists('test-ui-lib/src/lib/another-cmp/another-cmp.stories.tsx')
     ).toBeTruthy();
   });
 
@@ -49,18 +45,14 @@ describe('react-native:stories for libraries', () => {
     });
     await storiesGenerator(appTree, {
       project: 'test-ui-lib',
-      ignorePaths: ['libs/test-ui-lib/src/lib/another-cmp/**'],
+      ignorePaths: ['test-ui-lib/src/lib/another-cmp/**'],
     });
 
     expect(
-      appTree.exists(
-        'libs/test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx'
-      )
+      appTree.exists('test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx')
     ).toBeTruthy();
     expect(
-      appTree.exists(
-        'libs/test-ui-lib/src/lib/another-cmp/another-cmp.stories.tsx'
-      )
+      appTree.exists('test-ui-lib/src/lib/another-cmp/another-cmp.stories.tsx')
     ).toBeFalsy();
   });
 
@@ -71,7 +63,7 @@ describe('react-native:stories for libraries', () => {
     });
     // create another component
     appTree.write(
-      'libs/test-ui-lib/src/lib/some-command-line-utils.ts',
+      'test-ui-lib/src/lib/some-command-line-utils.ts',
       `export const add = (a: number, b: number) => a + b;`
     );
 
@@ -82,15 +74,13 @@ describe('react-native:stories for libraries', () => {
     // should just create the story and not error, even though there's a js file
     // not containing any react component
     expect(
-      appTree.exists(
-        'libs/test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx'
-      )
+      appTree.exists('test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx')
     ).toBeTruthy();
   });
 });
 
 export async function createTestUILib(libName: string): Promise<Tree> {
-  let appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+  let appTree = createTreeWithEmptyWorkspace();
   appTree.write('.gitignore', '');
 
   await libraryGenerator(appTree, {
@@ -99,6 +89,7 @@ export async function createTestUILib(libName: string): Promise<Tree> {
     skipTsConfig: false,
     unitTestRunner: 'none',
     name: libName,
+    projectNameAndRootFormat: 'as-provided',
   });
 
   await applicationGenerator(appTree, {
@@ -108,6 +99,7 @@ export async function createTestUILib(libName: string): Promise<Tree> {
     unitTestRunner: 'none',
     name: `${libName}-e2e`,
     install: false,
+    projectNameAndRootFormat: 'as-provided',
   });
   return appTree;
 }

package/src/generators/stories/stories.js

@@ -1,61 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storiesSchematic = exports.storiesGenerator = exports.createAllStories = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const component_story_1 = require("../component-story/component-story");
 const stories_1 = require("@nx/react/src/generators/stories/stories");
 const minimatch = require("minimatch");
 const versions_1 = require("../../utils/versions");
-function createAllStories(tree, projectName, ignorePaths) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
-        const { isTheFileAStory } = yield Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
-        const projects = (0, devkit_1.getProjects)(tree);
-        const projectConfiguration = projects.get(projectName);
-        const { sourceRoot } = projectConfiguration;
-        const projectPath = yield (0, stories_1.projectRootPath)(tree, projectConfiguration);
-        let componentPaths = [];
-        (0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
-            if (ignorePaths === null || ignorePaths === void 0 ? void 0 : ignorePaths.some((pattern) => minimatch(path, pattern)))
-                return;
-            if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
-                (path.endsWith('.js') && !path.endsWith('.spec.js')) ||
-                (path.endsWith('.jsx') && !path.endsWith('.spec.jsx'))) {
-                // Check if file is NOT a story (either ts/tsx or js/jsx)
-                if (!isTheFileAStory(tree, path)) {
-                    // Since the file is not a story
-                    // Let's see if the .stories.* file exists
-                    const ext = path.slice(path.lastIndexOf('.'));
-                    const storyPath = `${path.split(ext)[0]}.stories${ext}`;
-                    if (!tree.exists(storyPath)) {
-                        componentPaths.push(path);
-                    }
+async function createAllStories(tree, projectName, ignorePaths) {
+    (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
+    const { isTheFileAStory } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
+    const projects = (0, devkit_1.getProjects)(tree);
+    const projectConfiguration = projects.get(projectName);
+    const { sourceRoot } = projectConfiguration;
+    const projectPath = await (0, stories_1.projectRootPath)(tree, projectConfiguration);
+    let componentPaths = [];
+    (0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
+        if (ignorePaths?.some((pattern) => minimatch(path, pattern)))
+            return;
+        if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
+            (path.endsWith('.js') && !path.endsWith('.spec.js')) ||
+            (path.endsWith('.jsx') && !path.endsWith('.spec.jsx'))) {
+            // Check if file is NOT a story (either ts/tsx or js/jsx)
+            if (!isTheFileAStory(tree, path)) {
+                // Since the file is not a story
+                // Let's see if the .stories.* file exists
+                const ext = path.slice(path.lastIndexOf('.'));
+                const storyPath = `${path.split(ext)[0]}.stories${ext}`;
+                if (!tree.exists(storyPath)) {
+                    componentPaths.push(path);
                 }
             }
-        });
-        yield Promise.all(componentPaths.map((componentPath) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const relativeCmpDir = componentPath.replace((0, path_1.join)(sourceRoot, '/'), '');
-            if (!(0, stories_1.containsComponentDeclaration)(tree, componentPath)) {
-                return;
-            }
-            yield (0, component_story_1.default)(tree, {
-                componentPath: relativeCmpDir,
-                project: projectName,
-                skipFormat: true,
-            });
-        })));
+        }
     });
+    await Promise.all(componentPaths.map(async (componentPath) => {
+        const relativeCmpDir = componentPath.replace((0, path_1.join)(sourceRoot, '/'), '');
+        if (!(0, stories_1.containsComponentDeclaration)(tree, componentPath)) {
+            return;
+        }
+        await (0, component_story_1.default)(tree, {
+            componentPath: relativeCmpDir,
+            project: projectName,
+            skipFormat: true,
+        });
+    }));
 }
 exports.createAllStories = createAllStories;
-function storiesGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield createAllStories(host, schema.project, schema.ignorePaths);
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-    });
+async function storiesGenerator(host, schema) {
+    await createAllStories(host, schema.project, schema.ignorePaths);
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
 }
 exports.storiesGenerator = storiesGenerator;
 exports.default = storiesGenerator;

package/src/generators/storybook-configuration/configuration.js

@@ -1,49 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationSchematic = exports.storybookConfigurationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const stories_1 = require("../stories/stories");
 const add_resolver_main_fields_to_metro_config_1 = require("./lib/add-resolver-main-fields-to-metro-config");
 const create_storybook_files_1 = require("./lib/create-storybook-files");
 const replace_app_import_with_storybook_toggle_1 = require("./lib/replace-app-import-with-storybook-toggle");
-function generateStories(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, stories_1.default)(host, {
-            project: schema.name,
-            ignorePaths: schema.ignorePaths,
-            skipFormat: true,
-        });
+async function generateStories(host, schema) {
+    await (0, stories_1.default)(host, {
+        project: schema.name,
+        ignorePaths: schema.ignorePaths,
+        skipFormat: true,
     });
 }
-function storybookConfigurationGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
-        const installTask = yield configurationGenerator(host, {
-            name: schema.name,
-            uiFramework: '@storybook/react-native',
-            configureCypress: false,
-            js: false,
-            linter: schema.linter,
-            standaloneConfig: schema.standaloneConfig,
-            tsConfiguration: schema.tsConfiguration,
-            skipFormat: true,
-        });
-        const installRequiredPackagesTask = yield (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            '@react-native-async-storage/async-storage': versions_1.reactNativeAsyncStorageVersion,
-            'react-native-safe-area-context': versions_1.reactNativeSafeAreaContextVersion,
-        });
-        addStorybookTask(host, schema.name);
-        (0, create_storybook_files_1.createStorybookFiles)(host, schema);
-        (0, replace_app_import_with_storybook_toggle_1.replaceAppImportWithStorybookToggle)(host, schema);
-        (0, add_resolver_main_fields_to_metro_config_1.addResolverMainFieldsToMetroConfig)(host, schema);
-        if (schema.generateStories) {
-            yield generateStories(host, schema);
-        }
-        yield (0, devkit_1.formatFiles)(host);
-        return (0, devkit_1.runTasksInSerial)(installTask, installRequiredPackagesTask);
+async function storybookConfigurationGenerator(host, schema) {
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
+    const installTask = await configurationGenerator(host, {
+        name: schema.name,
+        uiFramework: '@storybook/react-native',
+        configureCypress: false,
+        js: false,
+        linter: schema.linter,
+        standaloneConfig: schema.standaloneConfig,
+        tsConfiguration: schema.tsConfiguration,
+        skipFormat: true,
     });
+    const installRequiredPackagesTask = await (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+        '@react-native-async-storage/async-storage': versions_1.reactNativeAsyncStorageVersion,
+        'react-native-safe-area-context': versions_1.reactNativeSafeAreaContextVersion,
+    });
+    addStorybookTask(host, schema.name);
+    (0, create_storybook_files_1.createStorybookFiles)(host, schema);
+    (0, replace_app_import_with_storybook_toggle_1.replaceAppImportWithStorybookToggle)(host, schema);
+    (0, add_resolver_main_fields_to_metro_config_1.addResolverMainFieldsToMetroConfig)(host, schema);
+    if (schema.generateStories) {
+        await generateStories(host, schema);
+    }
+    await (0, devkit_1.formatFiles)(host);
+    return (0, devkit_1.runTasksInSerial)(installTask, installRequiredPackagesTask);
 }
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 function addStorybookTask(host, projectName) {

package/src/generators/storybook-configuration/configuration.spec.ts

@@ -36,11 +36,9 @@ describe('react-native:storybook-configuration', () => {
         name: 'test-ui-lib',
       });
 
+      expect(appTree.exists('test-ui-lib/.storybook/main.js')).toBeTruthy();
       expect(
-        appTree.exists('libs/test-ui-lib/.storybook/main.js')
-      ).toBeTruthy();
-      expect(
-        appTree.exists('libs/test-ui-lib/tsconfig.storybook.json')
+        appTree.exists('test-ui-lib/tsconfig.storybook.json')
       ).toBeTruthy();
     });
 
@@ -57,7 +55,7 @@ describe('react-native:storybook-configuration', () => {
 
       expect(
         appTree.exists(
-          'libs/test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx'
+          'test-ui-lib/src/lib/test-ui-lib/test-ui-lib.stories.tsx'
         )
       ).toBeTruthy();
     });
@@ -70,11 +68,9 @@ describe('react-native:storybook-configuration', () => {
         name: 'test-ui-app',
       });
 
+      expect(appTree.exists('test-ui-app/.storybook/main.js')).toBeTruthy();
       expect(
-        appTree.exists('apps/test-ui-app/.storybook/main.js')
-      ).toBeTruthy();
-      expect(
-        appTree.exists('apps/test-ui-app/tsconfig.storybook.json')
+        appTree.exists('test-ui-app/tsconfig.storybook.json')
       ).toBeTruthy();
     });
 
@@ -90,7 +86,7 @@ describe('react-native:storybook-configuration', () => {
       // under the specified 'lib' directory
       expect(
         appTree.exists(
-          'apps/test-ui-app/src/app/my-component/my-component.stories.tsx'
+          'test-ui-app/src/app/my-component/my-component.stories.tsx'
         )
       ).toBeTruthy();
     });
@@ -98,7 +94,7 @@ describe('react-native:storybook-configuration', () => {
 });
 
 export async function createTestUILib(libName: string): Promise<Tree> {
-  let appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+  let appTree = createTreeWithEmptyWorkspace();
 
   await libraryGenerator(appTree, {
     linter: Linter.EsLint,
@@ -106,6 +102,7 @@ export async function createTestUILib(libName: string): Promise<Tree> {
     skipTsConfig: false,
     unitTestRunner: 'none',
     name: libName,
+    projectNameAndRootFormat: 'as-provided',
   });
   return appTree;
 }
@@ -114,7 +111,7 @@ export async function createTestAppLib(
   libName: string,
   plainJS = false
 ): Promise<Tree> {
-  let appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+  let appTree = createTreeWithEmptyWorkspace();
 
   await applicationGenerator(appTree, {
     e2eTestRunner: 'none',
@@ -125,6 +122,7 @@ export async function createTestAppLib(
     name: libName,
     js: plainJS,
     install: false,
+    projectNameAndRootFormat: 'as-provided',
   });
 
   await componentGenerator(appTree, {

package/src/generators/storybook-configuration/lib/add-resolver-main-fields-to-metro-config.js

@@ -18,7 +18,7 @@ function addResolverMainFieldsToMetroConfig(host, schema) {
         }
         host.write(metroConfigPath, metroConfigContent.replace(/},\s+resolver: {/, `},resolver: { resolverMainFields: ['sbmodern', 'browser', 'main'],`));
     }
-    catch (_a) {
+    catch {
         devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update ${metroConfigPath} for project ${root}.`);
     }
 }

package/src/generators/storybook-configuration/lib/add-resolver-main-fields-to-metro-config.spec.ts

@@ -9,17 +9,17 @@ describe('addResolverMainFieldsToMetroConfig', () => {
   let tree: Tree;
 
   beforeEach(() => {
-    tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    tree = createTreeWithEmptyWorkspace();
 
     addProjectConfiguration(tree, 'products', {
-      root: 'apps/products',
-      sourceRoot: 'apps/products/src',
+      root: 'products',
+      sourceRoot: 'products/src',
     });
   });
 
   it(`should update metro.config.js and add key projectRoot`, async () => {
     tree.write(
-      'apps/products/metro.config.js',
+      'products/metro.config.js',
       formatFile`
 const { withNxMetro } = require('@nx/react-native');
 const { getDefaultConfig } = require('metro-config');
@@ -55,7 +55,7 @@ module.exports = (async () => {
     });
 
     expect(
-      formatFile`${tree.read('apps/products/metro.config.js', 'utf-8')}`
+      formatFile`${tree.read('products/metro.config.js', 'utf-8')}`
     ).toEqual(
       formatFile`
 const { withNxMetro } = require('@nx/react-native');
@@ -91,7 +91,7 @@ module.exports = (async () => {
 
   it(`should not udpate metro.config.js if projectRoot already exists`, async () => {
     tree.write(
-      'apps/products/metro.config.js',
+      'products/metro.config.js',
       `
 const { withNxMetro } = require('@nx/react-native');
 const { getDefaultConfig } = require('metro-config');
@@ -126,7 +126,7 @@ module.exports = (async () => {
       name: 'products',
     });
 
-    expect(tree.read('apps/products/metro.config.js', 'utf-8')).toEqual(
+    expect(tree.read('products/metro.config.js', 'utf-8')).toEqual(
       `
 const { withNxMetro } = require('@nx/react-native');
 const { getDefaultConfig } = require('metro-config');

package/src/generators/storybook-configuration/lib/create-storybook-files.js

@@ -1,46 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStorybookFiles = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const chalk = require("chalk");
 /**
  * This function generate ./storybook under project root.
  */
-function createStorybookFiles(host, schema) {
-    var _a, _b, _c, _d;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { root, projectType, targets, sourceRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.name);
-        // do not proceed if not a react native project
-        if (((_a = targets === null || targets === void 0 ? void 0 : targets.start) === null || _a === void 0 ? void 0 : _a.executor) !== '@nx/react-native:start' &&
-            ((_b = targets === null || targets === void 0 ? void 0 : targets.start) === null || _b === void 0 ? void 0 : _b.executor) !== '@nx/expo:start' &&
-            ((_c = targets === null || targets === void 0 ? void 0 : targets.start) === null || _c === void 0 ? void 0 : _c.executor) !== '@nrwl/react-native:start' &&
-            ((_d = targets === null || targets === void 0 ? void 0 : targets.start) === null || _d === void 0 ? void 0 : _d.executor) !== '@nrwl/expo:start') {
-            devkit_1.logger.error(`Unable to add storybook to ${schema.name}. It is not a Nx React Native / Expo project.`);
-            return;
-        }
-        const storybookUIFileName = schema.js ? 'storybook.js' : 'storybook.ts';
-        const storybookUIFilePath = (0, path_1.join)(root, `./${storybookUIFileName}`);
-        if (host.exists(storybookUIFilePath)) {
-            devkit_1.logger.warn(`${storybookUIFileName} file already exists for ${projectType} ${schema.name}! Skipping generating this file.`);
-            return;
-        }
-        if (projectType !== 'application') {
-            devkit_1.logger.info(`${chalk.bold.cyan('info')} To see your Storybook stories on the device, you should start your mobile app for the <platform> of your choice (typically ios or android).`);
-        }
-        // copy files to app's .storybook folder
-        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), (0, path_1.join)(root, 'src', 'storybook'), {
-            tmpl: '',
-            offsetFromRoot: (0, devkit_1.offsetFromRoot)(sourceRoot),
-        });
-        // copy files to workspace root's .storybook folder
-        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/root'), (0, path_1.join)(root, (0, devkit_1.offsetFromRoot)(root), '.storybook'), {
-            tmpl: '',
-        });
-        if (schema.js) {
-            (0, devkit_1.toJS)(host);
-        }
+async function createStorybookFiles(host, schema) {
+    const { root, projectType, targets, sourceRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.name);
+    // do not proceed if not a react native project
+    if (targets?.start?.executor !== '@nx/react-native:start' &&
+        targets?.start?.executor !== '@nx/expo:start' &&
+        targets?.start?.executor !== '@nrwl/react-native:start' &&
+        targets?.start?.executor !== '@nrwl/expo:start') {
+        devkit_1.logger.error(`Unable to add storybook to ${schema.name}. It is not a Nx React Native / Expo project.`);
+        return;
+    }
+    const storybookUIFileName = schema.js ? 'storybook.js' : 'storybook.ts';
+    const storybookUIFilePath = (0, path_1.join)(root, `./${storybookUIFileName}`);
+    if (host.exists(storybookUIFilePath)) {
+        devkit_1.logger.warn(`${storybookUIFileName} file already exists for ${projectType} ${schema.name}! Skipping generating this file.`);
+        return;
+    }
+    if (projectType !== 'application') {
+        devkit_1.logger.info(`${chalk.bold.cyan('info')} To see your Storybook stories on the device, you should start your mobile app for the <platform> of your choice (typically ios or android).`);
+    }
+    // copy files to app's .storybook folder
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), (0, path_1.join)(root, 'src', 'storybook'), {
+        tmpl: '',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(sourceRoot),
     });
+    // copy files to workspace root's .storybook folder
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/root'), (0, path_1.join)(root, (0, devkit_1.offsetFromRoot)(root), '.storybook'), {
+        tmpl: '',
+    });
+    if (schema.js) {
+        (0, devkit_1.toJS)(host);
+    }
 }
 exports.createStorybookFiles = createStorybookFiles;

package/src/generators/storybook-configuration/lib/replace-app-import-with-storybook-toggle.js

@@ -22,7 +22,7 @@ function replaceAppImportWithStorybookToggle(host, schema) {
         }
         host.write(mainFilePath, contents.replace(appImportImport, storybookeToggleImport));
     }
-    catch (_a) {
+    catch {
         devkit_1.logger.warn((0, devkit_1.stripIndents) `Unable to update import in ${mainFilePath} for project ${root}.`);
     }
 }

package/src/generators/storybook-configuration/lib/replace-app-import-with-storybook-toggle.spec.ts

@@ -9,17 +9,17 @@ describe('replaceAppImportWithStorybookToggle', () => {
   let tree: Tree;
 
   beforeEach(() => {
-    tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    tree = createTreeWithEmptyWorkspace();
 
     addProjectConfiguration(tree, 'products', {
-      root: 'apps/products',
-      sourceRoot: 'apps/products/src',
+      root: 'products',
+      sourceRoot: 'products/src',
     });
   });
 
   it('should update the main file with import from storybook', async () => {
     tree.write(
-      '/apps/products/src/main.tsx',
+      'products/src/main.tsx',
       formatFile`import { AppRegistry } from 'react-native';
       import App from './app/App';
       
@@ -31,7 +31,7 @@ describe('replaceAppImportWithStorybookToggle', () => {
       js: false,
     });
 
-    const mainFile = tree.read('apps/products/src/main.tsx', 'utf-8');
+    const mainFile = tree.read('products/src/main.tsx', 'utf-8');
     expect(formatFile`${mainFile}`).toEqual(
       formatFile`import { AppRegistry } from 'react-native';
       import App from './storybook/toggle-storybook';
@@ -42,7 +42,7 @@ describe('replaceAppImportWithStorybookToggle', () => {
 
   it('should not update the main file if import is already updated', async () => {
     tree.write(
-      '/apps/products/src/main.tsx',
+      'products/src/main.tsx',
       formatFile`import { AppRegistry } from 'react-native';
       import App from './app/App';
       
@@ -54,7 +54,7 @@ describe('replaceAppImportWithStorybookToggle', () => {
       js: false,
     });
 
-    const mainFile = tree.read('apps/products/src/main.tsx', 'utf-8');
+    const mainFile = tree.read('products/src/main.tsx', 'utf-8');
     expect(formatFile`${mainFile}`).toEqual(
       formatFile`import { AppRegistry } from 'react-native';
       import App from './storybook/toggle-storybook';

package/src/generators/upgrade-native/upgrade-native.js

@@ -5,27 +5,24 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeUpgradeNativeSchematic = exports.reactNativeUpgradeNativeGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const pod_install_task_1 = require("../../utils/pod-install-task");
 const chmod_android_gradle_files_1 = require("../../utils/chmod-android-gradle-files");
 const create_native_files_1 = require("./lib/create-native-files");
-function reactNativeUpgradeNativeGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectType, root: appProjectRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.name);
-        const iosProjectRoot = (0, devkit_1.joinPathFragments)(host.root, appProjectRoot, 'ios');
-        const androidProjectRoot = (0, devkit_1.joinPathFragments)(host.root, appProjectRoot, 'android');
-        if (projectType !== 'application' ||
-            !(0, fs_1.existsSync)(iosProjectRoot) ||
-            !(0, fs_1.existsSync)(androidProjectRoot)) {
-            throw new Error(`Could not upgrade React Native code for ${schema.name}`);
-        }
-        (0, create_native_files_1.createNativeFiles)(host, schema, appProjectRoot);
-        const podInstallTask = (0, pod_install_task_1.runPodInstall)(iosProjectRoot, schema.install);
-        const chmodTaskGradlew = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)(androidProjectRoot);
-        return (0, devkit_1.runTasksInSerial)(podInstallTask, chmodTaskGradlew);
-    });
+async function reactNativeUpgradeNativeGenerator(host, schema) {
+    const { projectType, root: appProjectRoot } = (0, devkit_1.readProjectConfiguration)(host, schema.name);
+    const iosProjectRoot = (0, devkit_1.joinPathFragments)(host.root, appProjectRoot, 'ios');
+    const androidProjectRoot = (0, devkit_1.joinPathFragments)(host.root, appProjectRoot, 'android');
+    if (projectType !== 'application' ||
+        !(0, fs_1.existsSync)(iosProjectRoot) ||
+        !(0, fs_1.existsSync)(androidProjectRoot)) {
+        throw new Error(`Could not upgrade React Native code for ${schema.name}`);
+    }
+    (0, create_native_files_1.createNativeFiles)(host, schema, appProjectRoot);
+    const podInstallTask = (0, pod_install_task_1.runPodInstall)(iosProjectRoot, schema.install);
+    const chmodTaskGradlew = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)(androidProjectRoot);
+    return (0, devkit_1.runTasksInSerial)(podInstallTask, chmodTaskGradlew);
 }
 exports.reactNativeUpgradeNativeGenerator = reactNativeUpgradeNativeGenerator;
 exports.default = reactNativeUpgradeNativeGenerator;

package/src/migrations/update-12-10-0/add-react-native-svg-12-10-0.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 /**
  * Add support to display svg in react native:
@@ -8,19 +7,16 @@ const devkit_1 = require("@nx/devkit");
  * - Add typing to app's tsconfig.json.
  * - Add react-native-svg to app's package.json.
  */
-function update(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        projects.forEach((project) => {
-            var _a, _b;
-            if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.start) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/react-native:start')
-                return;
-            addReactNativeSvgToAppPackageJson(tree, project);
-            addReactNativeSvgToTsconfig(tree, project);
-            mockSvgInJestConfig(tree, project);
-        });
-        yield (0, devkit_1.formatFiles)(tree);
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    projects.forEach((project) => {
+        if (project.targets?.start?.executor !== '@nrwl/react-native:start')
+            return;
+        addReactNativeSvgToAppPackageJson(tree, project);
+        addReactNativeSvgToTsconfig(tree, project);
+        mockSvgInJestConfig(tree, project);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;
 function addReactNativeSvgToAppPackageJson(host, project) {
@@ -46,8 +42,7 @@ function addReactNativeSvgToTsconfig(host, project) {
     });
 }
 function mockSvgInJestConfig(host, project) {
-    var _a, _b, _c;
-    const jestConfigPath = (_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.test) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.jestConfig;
+    const jestConfigPath = project.targets?.test?.options?.jestConfig;
     if (!jestConfigPath || !host.exists(jestConfigPath))
         return;
     try {
@@ -56,7 +51,7 @@ function mockSvgInJestConfig(host, project) {
             return;
         host.write(jestConfigPath, contents.replace(/,([^,]*)$/, `, moduleNameMapper: {'\\.svg': '@nrwl/react-native/plugins/jest/svg-mock'}, $1`));
     }
-    catch (_d) {
+    catch {
         devkit_1.logger.error((0, devkit_1.stripIndents) `Unable to update ${jestConfigPath} for project ${project.root}.`);
     }
 }