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

package/src/executors/storybook/storybook.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCliStorybook = void 0;
-const tslib_1 = require("tslib");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
@@ -9,25 +8,23 @@ const chalk = require("chalk");
 const glob_1 = require("glob");
 const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 const fs_extra_1 = require("fs-extra");
-function reactNativeStorybookExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* reactNativeStorybookExecutor_1() {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        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).`);
-        // add storybook addons to app's package.json
-        const packageJsonPath = (0, path_1.join)(context.root, projectRoot, 'package.json');
-        if ((0, fileutils_1.fileExists)(packageJsonPath))
-            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield tslib_1.__await((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root, context.projectGraph, [
-                `@storybook/react-native`,
-                '@storybook/addon-ondevice-actions',
-                '@storybook/addon-ondevice-backgrounds',
-                '@storybook/addon-ondevice-controls',
-                '@storybook/addon-ondevice-notes',
-                '@react-native-async-storage/async-storage',
-                'react-native-safe-area-context',
-            ])));
-        runCliStorybook(context.root, options);
-        yield yield tslib_1.__await({ success: true });
-    });
+async function* reactNativeStorybookExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    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).`);
+    // add storybook addons to app's package.json
+    const packageJsonPath = (0, path_1.join)(context.root, projectRoot, 'package.json');
+    if ((0, fileutils_1.fileExists)(packageJsonPath))
+        (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, await (0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root, context.projectGraph, [
+            `@storybook/react-native`,
+            '@storybook/addon-ondevice-actions',
+            '@storybook/addon-ondevice-backgrounds',
+            '@storybook/addon-ondevice-controls',
+            '@storybook/addon-ondevice-notes',
+            '@react-native-async-storage/async-storage',
+            'react-native-safe-area-context',
+        ]));
+    runCliStorybook(context.root, options);
+    yield { success: true };
 }
 exports.default = reactNativeStorybookExecutor;
 function runCliStorybook(workspaceRoot, options) {

package/src/executors/sync-deps/sync-deps.impl.js

@@ -1,52 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.displayNewlyAddedDepsMessage = exports.syncDeps = void 0;
-const tslib_1 = require("tslib");
 const path_1 = require("path");
 const chalk = require("chalk");
 const devkit_1 = require("@nx/devkit");
 const find_all_npm_dependencies_1 = require("../../utils/find-all-npm-dependencies");
-function syncDepsExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* syncDepsExecutor_1() {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        displayNewlyAddedDepsMessage(context.projectName, yield tslib_1.__await(syncDeps(context.projectName, projectRoot, context.root, context.projectGraph, typeof options.include === 'string'
-            ? options.include.split(',')
-            : options.include, typeof options.exclude === 'string'
-            ? options.exclude.split(',')
-            : options.exclude)));
-        yield yield tslib_1.__await({ success: true });
-    });
+async function* syncDepsExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(context.projectName, projectRoot, context.root, context.projectGraph, typeof options.include === 'string'
+        ? options.include.split(',')
+        : options.include, typeof options.exclude === 'string'
+        ? options.exclude.split(',')
+        : options.exclude));
+    yield { success: true };
 }
 exports.default = syncDepsExecutor;
-function syncDeps(projectName, projectRoot, workspaceRoot, projectGraph, include = [], exclude = []) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let npmDeps = (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
-        const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
-        const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
-        const newDeps = [];
-        let updated = false;
-        if (!packageJson.dependencies) {
-            packageJson.dependencies = {};
+async function syncDeps(projectName, projectRoot, workspaceRoot, projectGraph, include = [], exclude = []) {
+    let npmDeps = (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
+    const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
+    const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
+    const newDeps = [];
+    let updated = false;
+    if (!packageJson.dependencies) {
+        packageJson.dependencies = {};
+        updated = true;
+    }
+    if (include && include.length) {
+        npmDeps.push(...include);
+    }
+    if (exclude && exclude.length) {
+        npmDeps = npmDeps.filter((dep) => !exclude.includes(dep));
+    }
+    npmDeps.forEach((dep) => {
+        if (!packageJson.dependencies[dep]) {
+            packageJson.dependencies[dep] = '*';
+            newDeps.push(dep);
             updated = true;
         }
-        if (include && include.length) {
-            npmDeps.push(...include);
-        }
-        if (exclude && exclude.length) {
-            npmDeps = npmDeps.filter((dep) => !exclude.includes(dep));
-        }
-        npmDeps.forEach((dep) => {
-            if (!packageJson.dependencies[dep]) {
-                packageJson.dependencies[dep] = '*';
-                newDeps.push(dep);
-                updated = true;
-            }
-        });
-        if (updated) {
-            (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
-        }
-        return newDeps;
     });
+    if (updated) {
+        (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
+    }
+    return newDeps;
 }
 exports.syncDeps = syncDeps;
 function displayNewlyAddedDepsMessage(projectName, deps) {

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeApplicationSchematic = exports.reactNativeApplicationGeneratorInternal = exports.reactNativeApplicationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const symlink_task_1 = require("../../utils/symlink-task");
 const add_linting_1 = require("../../utils/add-linting");
@@ -12,30 +11,33 @@ const init_1 = require("../init/init");
 const add_project_1 = require("./lib/add-project");
 const create_application_files_1 = require("./lib/create-application-files");
 const add_detox_1 = require("./lib/add-detox");
-function reactNativeApplicationGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield reactNativeApplicationGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function reactNativeApplicationGenerator(host, schema) {
+    return await reactNativeApplicationGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.reactNativeApplicationGenerator = reactNativeApplicationGenerator;
-function reactNativeApplicationGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        (0, create_application_files_1.createApplicationFiles)(host, options);
-        (0, add_project_1.addProject)(host, options);
-        const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        const lintTask = yield (0, add_linting_1.addLinting)(host, Object.assign(Object.assign({}, options), { projectRoot: options.appProjectRoot, tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            ] }));
-        const jestTask = yield (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
-        const detoxTask = yield (0, add_detox_1.addDetox)(host, options);
-        const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
-        const chmodTaskGradlew = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)((0, devkit_1.joinPathFragments)(host.root, options.androidProjectRoot));
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask, chmodTaskGradlew);
+async function reactNativeApplicationGeneratorInternal(host, schema) {
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    (0, create_application_files_1.createApplicationFiles)(host, options);
+    (0, add_project_1.addProject)(host, options);
+    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
+    const lintTask = await (0, add_linting_1.addLinting)(host, {
+        ...options,
+        projectRoot: options.appProjectRoot,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+        ],
     });
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
+    const detoxTask = await (0, add_detox_1.addDetox)(host, options);
+    const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
+    const chmodTaskGradlew = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)((0, devkit_1.joinPathFragments)(host.root, options.androidProjectRoot));
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask, chmodTaskGradlew);
 }
 exports.reactNativeApplicationGeneratorInternal = reactNativeApplicationGeneratorInternal;
 exports.default = reactNativeApplicationGenerator;

package/src/generators/application/application.spec.ts

@@ -12,7 +12,7 @@ describe('app', () => {
   let appTree: Tree;
 
   beforeEach(() => {
-    appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    appTree = createTreeWithEmptyWorkspace();
     appTree.write('.gitignore', '');
   });
 
@@ -23,10 +23,11 @@ describe('app', () => {
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     });
     const projects = getProjects(appTree);
 
-    expect(projects.get('my-app').root).toEqual('apps/my-app');
+    expect(projects.get('my-app').root).toEqual('my-app');
   });
 
   it('should update nx.json', async () => {
@@ -37,6 +38,7 @@ describe('app', () => {
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     });
 
     const projectConfiguration = readProjectConfiguration(appTree, 'my-app');
@@ -52,15 +54,16 @@ describe('app', () => {
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     });
-    expect(appTree.exists('apps/my-app/src/app/App.tsx')).toBeTruthy();
-    expect(appTree.exists('apps/my-app/src/main.tsx')).toBeTruthy();
+    expect(appTree.exists('my-app/src/app/App.tsx')).toBeTruthy();
+    expect(appTree.exists('my-app/src/main.tsx')).toBeTruthy();
 
-    const tsconfig = readJson(appTree, 'apps/my-app/tsconfig.json');
-    expect(tsconfig.extends).toEqual('../../tsconfig.base.json');
+    const tsconfig = readJson(appTree, 'my-app/tsconfig.json');
+    expect(tsconfig.extends).toEqual('../tsconfig.base.json');
 
-    expect(appTree.exists('apps/my-app/.eslintrc.json')).toBe(true);
-    expect(appTree.read('apps/my-app/jest.config.ts', 'utf-8'))
+    expect(appTree.exists('my-app/.eslintrc.json')).toBe(true);
+    expect(appTree.read('my-app/jest.config.ts', 'utf-8'))
       .toMatchInlineSnapshot(`
       "module.exports = {
         displayName: 'my-app',
@@ -71,7 +74,7 @@ describe('app', () => {
         moduleNameMapper: {
           '\\\\.svg$': '@nx/react-native/plugins/jest/svg-mock',
         },
-        coverageDirectory: '../../coverage/apps/my-app',
+        coverageDirectory: '../coverage/my-app',
       };
       "
     `);
@@ -84,6 +87,7 @@ describe('app', () => {
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     });
     const targets = readProjectConfiguration(appTree, 'my-app').targets;
     expect(targets.test).toBeDefined();
@@ -98,10 +102,11 @@ describe('app', () => {
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     });
 
-    const tsconfig = readJson(appTree, 'apps/my-app/tsconfig.json');
-    expect(tsconfig.extends).toEqual('../../tsconfig.json');
+    const tsconfig = readJson(appTree, 'my-app/tsconfig.json');
+    expect(tsconfig.extends).toEqual('../tsconfig.json');
   });
 
   describe('detox', () => {
@@ -112,18 +117,14 @@ describe('app', () => {
         linter: Linter.EsLint,
         e2eTestRunner: 'detox',
         install: false,
+        projectNameAndRootFormat: 'as-provided',
       });
 
       const projects = getProjects(appTree);
-      expect(projects.get('my-dir-my-app').root).toEqual('apps/my-dir/my-app');
-
-      expect(
-        appTree.exists('apps/my-dir/my-app-e2e/.detoxrc.json')
-      ).toBeTruthy();
-      const detoxrc = appTree.read(
-        'apps/my-dir/my-app-e2e/.detoxrc.json',
-        'utf-8'
-      );
+      expect(projects.get('my-app').root).toEqual('my-dir');
+
+      expect(appTree.exists('my-dir-e2e/.detoxrc.json')).toBeTruthy();
+      const detoxrc = appTree.read('my-dir-e2e/.detoxrc.json', 'utf-8');
       // Strip trailing commas
       const detoxrcJson = JSON.parse(
         detoxrc.replace(/(?<=(true|false|null|["\d}\]])\s*),(?=\s*[}\]])/g, '')
@@ -131,30 +132,30 @@ describe('app', () => {
       expect(detoxrcJson.apps).toEqual({
         'android.debug': {
           binaryPath:
-            '../../../apps/my-dir/my-app/android/app/build/outputs/apk/debug/app-debug.apk',
+            '../my-dir/android/app/build/outputs/apk/debug/app-debug.apk',
           build:
-            'cd ../../../apps/my-dir/my-app/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
+            'cd ../my-dir/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
           type: 'android.apk',
         },
         'android.release': {
           binaryPath:
-            '../../../apps/my-dir/my-app/android/app/build/outputs/apk/release/app-release.apk',
+            '../my-dir/android/app/build/outputs/apk/release/app-release.apk',
           build:
-            'cd ../../../apps/my-dir/my-app/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
+            'cd ../my-dir/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
           type: 'android.apk',
         },
         'ios.debug': {
           binaryPath:
-            '../../../apps/my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
+            '../my-dir/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
           build:
-            "cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
+            "cd ../my-dir/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
           type: 'ios.app',
         },
         'ios.release': {
           binaryPath:
-            '../../../apps/my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
+            '../my-dir/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
           build:
-            "cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
+            "cd ../my-dir/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
           type: 'ios.app',
         },
       });
@@ -166,12 +167,13 @@ describe('app', () => {
         linter: Linter.EsLint,
         e2eTestRunner: 'detox',
         install: false,
+        projectNameAndRootFormat: 'as-provided',
       });
 
       const projects = getProjects(appTree);
-      expect(projects.get('my-app').root).toEqual('apps/my-app');
+      expect(projects.get('my-app').root).toEqual('my-app');
 
-      const detoxrc = appTree.read('apps/my-app-e2e/.detoxrc.json', 'utf-8');
+      const detoxrc = appTree.read('my-app-e2e/.detoxrc.json', 'utf-8');
       // Strip trailing commas
       const detoxrcJson = JSON.parse(
         detoxrc.replace(/(?<=(true|false|null|["\d}\]])\s*),(?=\s*[}\]])/g, '')
@@ -179,30 +181,30 @@ describe('app', () => {
       expect(detoxrcJson.apps).toEqual({
         'android.debug': {
           binaryPath:
-            '../../apps/my-app/android/app/build/outputs/apk/debug/app-debug.apk',
+            '../my-app/android/app/build/outputs/apk/debug/app-debug.apk',
           build:
-            'cd ../../apps/my-app/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
+            'cd ../my-app/android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug',
           type: 'android.apk',
         },
         'android.release': {
           binaryPath:
-            '../../apps/my-app/android/app/build/outputs/apk/release/app-release.apk',
+            '../my-app/android/app/build/outputs/apk/release/app-release.apk',
           build:
-            'cd ../../apps/my-app/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
+            'cd ../my-app/android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
           type: 'android.apk',
         },
         'ios.debug': {
           binaryPath:
-            '../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
+            '../my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
           build:
-            "cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
+            "cd ../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
           type: 'ios.app',
         },
         'ios.release': {
           binaryPath:
-            '../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
+            '../my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
           build:
-            "cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
+            "cd ../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
           type: 'ios.app',
         },
       });
@@ -220,6 +222,7 @@ describe('app', () => {
         e2eTestRunner: 'none',
         install: false,
         skipPackageJson: true,
+        projectNameAndRootFormat: 'as-provided',
       });
 
       expect(readJson(appTree, 'package.json')).toEqual(packageJsonBefore);

package/src/generators/application/lib/add-detox.js

@@ -1,15 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDetox = void 0;
-const tslib_1 = require("tslib");
 const detox_1 = require("@nx/detox");
 const linter_1 = require("@nx/linter");
-function addDetox(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if ((options === null || options === void 0 ? void 0 : options.e2eTestRunner) !== 'detox') {
-            return () => { };
-        }
-        return (0, detox_1.detoxApplicationGenerator)(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, e2eName: `${options.projectName}-e2e`, e2eDirectory: `${options.appProjectRoot}-e2e`, projectNameAndRootFormat: 'as-provided', appProject: options.projectName, appDisplayName: options.displayName, appName: options.name, framework: 'react-native', skipFormat: true }));
+async function addDetox(host, options) {
+    if (options?.e2eTestRunner !== 'detox') {
+        return () => { };
+    }
+    return (0, detox_1.detoxApplicationGenerator)(host, {
+        ...options,
+        linter: linter_1.Linter.EsLint,
+        e2eName: `${options.projectName}-e2e`,
+        e2eDirectory: `${options.appProjectRoot}-e2e`,
+        projectNameAndRootFormat: 'as-provided',
+        appProject: options.projectName,
+        appDisplayName: options.displayName,
+        appName: options.name,
+        framework: 'react-native',
+        skipFormat: true,
     });
 }
 exports.addDetox = addDetox;

package/src/generators/application/lib/add-project.js

@@ -7,10 +7,12 @@ function addProject(host, options) {
         root: options.appProjectRoot,
         sourceRoot: `${options.appProjectRoot}/src`,
         projectType: 'application',
-        targets: Object.assign({}, getTargets(options)),
+        targets: { ...getTargets(options) },
         tags: options.parsedTags,
     };
-    (0, devkit_1.addProjectConfiguration)(host, options.projectName, Object.assign({}, project));
+    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+        ...project,
+    });
 }
 exports.addProject = addProject;
 function getTargets(options) {

package/src/generators/application/lib/create-application-files.js

@@ -5,7 +5,12 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
 function createApplicationFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), options.appProjectRoot, Object.assign(Object.assign({}, options), { entryFileIos: 'src/main', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot) }));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), options.appProjectRoot, {
+        ...options,
+        entryFileIos: 'src/main',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot),
+    });
     if (options.unitTestRunner === 'none') {
         host.delete((0, path_1.join)(options.appProjectRoot, `/src/app/App.spec.tsx`));
     }

package/src/generators/application/lib/nomalize-options.spec.ts

@@ -8,7 +8,7 @@ describe('Normalize Options', () => {
   let appTree: Tree;
 
   beforeEach(() => {
-    appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    appTree = createTreeWithEmptyWorkspace();
   });
 
   it('should normalize options with name in kebab case', async () => {
@@ -17,19 +17,20 @@ describe('Normalize Options', () => {
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
-      androidProjectRoot: 'apps/my-app/android',
-      appProjectRoot: 'apps/my-app',
+      androidProjectRoot: 'my-app/android',
+      appProjectRoot: 'my-app',
       className: 'MyApp',
       displayName: 'MyApp',
-      iosProjectRoot: 'apps/my-app/ios',
+      iosProjectRoot: 'my-app/ios',
       lowerCaseName: 'myapp',
       name: 'my-app',
       parsedTags: [],
       projectName: 'my-app',
-      projectNameAndRootFormat: 'derived',
+      projectNameAndRootFormat: 'as-provided',
       linter: Linter.EsLint,
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
@@ -43,19 +44,20 @@ describe('Normalize Options', () => {
       name: 'myApp',
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
-      androidProjectRoot: 'apps/my-app/android',
-      appProjectRoot: 'apps/my-app',
+      androidProjectRoot: 'my-app/android',
+      appProjectRoot: 'my-app',
       className: 'MyApp',
       displayName: 'MyApp',
-      iosProjectRoot: 'apps/my-app/ios',
+      iosProjectRoot: 'my-app/ios',
       lowerCaseName: 'myapp',
       name: 'my-app',
       parsedTags: [],
       projectName: 'my-app',
-      projectNameAndRootFormat: 'derived',
+      projectNameAndRootFormat: 'as-provided',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
       unitTestRunner: 'jest',
@@ -66,23 +68,24 @@ describe('Normalize Options', () => {
   it('should normalize options with directory', async () => {
     const schema: Schema = {
       name: 'my-app',
-      directory: 'directory',
+      directory: 'directory/my-app',
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
-      androidProjectRoot: 'apps/directory/my-app/android',
-      appProjectRoot: 'apps/directory/my-app',
+      androidProjectRoot: 'directory/my-app/android',
+      appProjectRoot: 'directory/my-app',
       className: 'MyApp',
       displayName: 'MyApp',
-      iosProjectRoot: 'apps/directory/my-app/ios',
+      iosProjectRoot: 'directory/my-app/ios',
       lowerCaseName: 'myapp',
       name: 'my-app',
-      directory: 'directory',
+      directory: 'directory/my-app',
       parsedTags: [],
-      projectName: 'directory-my-app',
-      projectNameAndRootFormat: 'derived',
+      projectName: 'my-app',
+      projectNameAndRootFormat: 'as-provided',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
       unitTestRunner: 'jest',
@@ -95,19 +98,20 @@ describe('Normalize Options', () => {
       name: 'directory/my-app',
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
-      androidProjectRoot: 'apps/directory/my-app/android',
-      appProjectRoot: 'apps/directory/my-app',
+      androidProjectRoot: 'directory/my-app/android',
+      appProjectRoot: 'directory/my-app',
       className: 'DirectoryMyApp',
       displayName: 'DirectoryMyApp',
-      iosProjectRoot: 'apps/directory/my-app/ios',
+      iosProjectRoot: 'directory/my-app/ios',
       lowerCaseName: 'directorymyapp',
       name: 'directory/my-app',
       parsedTags: [],
-      projectName: 'directory-my-app',
-      projectNameAndRootFormat: 'derived',
+      projectName: 'directory/my-app',
+      projectNameAndRootFormat: 'as-provided',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
       unitTestRunner: 'jest',
@@ -121,19 +125,20 @@ describe('Normalize Options', () => {
       displayName: 'My App',
       e2eTestRunner: 'none',
       install: false,
+      projectNameAndRootFormat: 'as-provided',
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
-      androidProjectRoot: 'apps/my-app/android',
-      appProjectRoot: 'apps/my-app',
+      androidProjectRoot: 'my-app/android',
+      appProjectRoot: 'my-app',
       className: 'MyApp',
       displayName: 'My App',
-      iosProjectRoot: 'apps/my-app/ios',
+      iosProjectRoot: 'my-app/ios',
       lowerCaseName: 'myapp',
       name: 'my-app',
       parsedTags: [],
       projectName: 'my-app',
-      projectNameAndRootFormat: 'derived',
+      projectNameAndRootFormat: 'as-provided',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
       unitTestRunner: 'jest',