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

package/src/generators/library/library.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeLibrarySchematic = exports.reactNativeLibraryGeneratorInternal = exports.reactNativeLibraryGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
@@ -9,100 +8,116 @@ const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
 const versions_1 = require("../../utils/versions");
 const normalize_options_1 = require("./lib/normalize-options");
-function reactNativeLibraryGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield reactNativeLibraryGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function reactNativeLibraryGenerator(host, schema) {
+    return await reactNativeLibraryGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.reactNativeLibraryGenerator = reactNativeLibraryGenerator;
-function reactNativeLibraryGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        if (options.publishable === true && !schema.importPath) {
-            throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
-        }
-        const tasks = [];
-        const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true, e2eTestRunner: 'none' }));
-        tasks.push(initTask);
-        const addProjectTask = yield addProject(host, options);
-        if (addProjectTask) {
-            tasks.push(addProjectTask);
-        }
-        createFiles(host, options);
-        const lintTask = yield (0, add_linting_1.addLinting)(host, Object.assign(Object.assign({}, options), { projectName: options.name, tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
-            ] }));
-        tasks.push(lintTask);
-        const jestTask = yield (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson);
-        tasks.push(jestTask);
-        if (options.publishable || options.buildable) {
-            updateLibPackageNpmScope(host, options);
-        }
-        if (!options.skipTsConfig) {
-            (0, js_1.addTsConfigPath)(host, options.importPath, [
-                (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
-            ]);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function reactNativeLibraryGeneratorInternal(host, schema) {
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    if (options.publishable === true && !schema.importPath) {
+        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
+    }
+    const tasks = [];
+    const initTask = await (0, init_1.default)(host, {
+        ...options,
+        skipFormat: true,
+        e2eTestRunner: 'none',
+    });
+    tasks.push(initTask);
+    const addProjectTask = await addProject(host, options);
+    if (addProjectTask) {
+        tasks.push(addProjectTask);
+    }
+    createFiles(host, options);
+    const lintTask = await (0, add_linting_1.addLinting)(host, {
+        ...options,
+        projectName: options.name,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
+        ],
     });
+    tasks.push(lintTask);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson);
+    tasks.push(jestTask);
+    if (options.publishable || options.buildable) {
+        updateLibPackageNpmScope(host, options);
+    }
+    if (!options.skipTsConfig) {
+        (0, js_1.addTsConfigPath)(host, options.importPath, [
+            (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
+        ]);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.reactNativeLibraryGeneratorInternal = reactNativeLibraryGeneratorInternal;
-function addProject(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const targets = {};
-        let task;
-        if (options.publishable || options.buildable) {
-            const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-            const external = [
-                'react/jsx-runtime',
-                'react-native',
-                'react',
-                'react-dom',
-            ];
-            targets.build = {
-                executor: '@nx/rollup:rollup',
-                outputs: ['{options.outputPath}'],
-                options: {
-                    outputPath: `dist/${options.projectRoot}`,
-                    tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-                    project: `${options.projectRoot}/package.json`,
-                    entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
-                    external,
-                    rollupConfig: `@nx/react/plugins/bundle-rollup`,
-                    assets: [
-                        {
-                            glob: `${options.projectRoot}/README.md`,
-                            input: '.',
-                            output: '.',
-                        },
-                    ],
-                },
-            };
-            task = yield rollupInitGenerator(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        }
-        (0, devkit_1.addProjectConfiguration)(host, options.name, {
-            root: options.projectRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
-            projectType: 'library',
-            tags: options.parsedTags,
-            targets,
-        });
-        return task;
+async function addProject(host, options) {
+    const targets = {};
+    let task;
+    if (options.publishable || options.buildable) {
+        const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+        const external = [
+            'react/jsx-runtime',
+            'react-native',
+            'react',
+            'react-dom',
+        ];
+        targets.build = {
+            executor: '@nx/rollup:rollup',
+            outputs: ['{options.outputPath}'],
+            options: {
+                outputPath: `dist/${options.projectRoot}`,
+                tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
+                project: `${options.projectRoot}/package.json`,
+                entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
+                external,
+                rollupConfig: `@nx/react/plugins/bundle-rollup`,
+                assets: [
+                    {
+                        glob: `${options.projectRoot}/README.md`,
+                        input: '.',
+                        output: '.',
+                    },
+                ],
+            },
+        };
+        task = await rollupInitGenerator(host, { ...options, skipFormat: true });
+    }
+    (0, devkit_1.addProjectConfiguration)(host, options.name, {
+        root: options.projectRoot,
+        sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
+        projectType: 'library',
+        tags: options.parsedTags,
+        targets,
     });
+    return task;
 }
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
         if (options.strict) {
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                forceConsistentCasingInFileNames: true,
+                strict: true,
+                noImplicitReturns: true,
+                noFallthroughCasesInSwitch: true,
+            };
         }
         return json;
     });
 }
 function createFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/lib'), options.projectRoot, Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot) }));
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/lib'), options.projectRoot, {
+        ...options,
+        ...(0, devkit_1.names)(options.name),
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+        rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
+    });
     if (!options.publishable && !options.buildable) {
         host.delete(`${options.projectRoot}/package.json`);
     }

package/src/generators/library/library.spec.ts

@@ -19,10 +19,11 @@ describe('lib', () => {
     skipTsConfig: false,
     unitTestRunner: 'jest',
     strict: true,
+    projectNameAndRootFormat: 'as-provided',
   };
 
   beforeEach(() => {
-    appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+    appTree = createTreeWithEmptyWorkspace();
     appTree.write('.gitignore', '');
   });
 
@@ -30,13 +31,13 @@ describe('lib', () => {
     it('should update project.json', async () => {
       await libraryGenerator(appTree, { ...defaultSchema, tags: 'one,two' });
       const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.root).toEqual('libs/my-lib');
+      expect(projectConfiguration.root).toEqual('my-lib');
       expect(projectConfiguration.targets.build).toBeUndefined();
       expect(projectConfiguration.targets.lint).toEqual({
         executor: '@nx/linter:eslint',
         outputs: ['{options.outputFile}'],
         options: {
-          lintFilePatterns: ['libs/my-lib/**/*.{ts,tsx,js,jsx}'],
+          lintFilePatterns: ['my-lib/**/*.{ts,tsx,js,jsx}'],
         },
       });
       expect(projectConfiguration.tags).toEqual(['one', 'two']);
@@ -46,7 +47,7 @@ describe('lib', () => {
       await libraryGenerator(appTree, defaultSchema);
       const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
       expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
-        'libs/my-lib/src/index.ts',
+        'my-lib/src/index.ts',
       ]);
     });
 
@@ -57,7 +58,7 @@ describe('lib', () => {
 
       const tsconfigJson = readJson(appTree, '/tsconfig.json');
       expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
-        'libs/my-lib/src/index.ts',
+        'my-lib/src/index.ts',
       ]);
     });
 
@@ -70,15 +71,15 @@ describe('lib', () => {
       await libraryGenerator(appTree, defaultSchema);
       const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
       expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
-        'libs/my-lib/src/index.ts',
+        'my-lib/src/index.ts',
       ]);
     });
 
     it('should create a local tsconfig.json', async () => {
       await libraryGenerator(appTree, defaultSchema);
 
-      const tsconfigJson = readJson(appTree, 'libs/my-lib/tsconfig.json');
-      expect(tsconfigJson.extends).toBe('../../tsconfig.base.json');
+      const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.json');
+      expect(tsconfigJson.extends).toBe('../tsconfig.base.json');
       expect(tsconfigJson.references).toEqual([
         {
           path: './tsconfig.lib.json',
@@ -102,19 +103,19 @@ describe('lib', () => {
 
       await libraryGenerator(appTree, defaultSchema);
 
-      const tsconfigJson = readJson(appTree, 'libs/my-lib/tsconfig.json');
-      expect(tsconfigJson.extends).toBe('../../tsconfig.json');
+      const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.json');
+      expect(tsconfigJson.extends).toBe('../tsconfig.json');
     });
 
     it('should extend the local tsconfig.json with tsconfig.spec.json', async () => {
       await libraryGenerator(appTree, defaultSchema);
-      const tsconfigJson = readJson(appTree, 'libs/my-lib/tsconfig.spec.json');
+      const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.spec.json');
       expect(tsconfigJson.extends).toEqual('./tsconfig.json');
     });
 
     it('should extend the local tsconfig.json with tsconfig.lib.json', async () => {
       await libraryGenerator(appTree, defaultSchema);
-      const tsconfigJson = readJson(appTree, 'libs/my-lib/tsconfig.lib.json');
+      const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.lib.json');
       expect(tsconfigJson.extends).toEqual('./tsconfig.json');
     });
   });
@@ -126,10 +127,8 @@ describe('lib', () => {
         directory: 'myDir',
         tags: 'one',
       });
-      const projectConfiguration = readProjectConfiguration(
-        appTree,
-        'my-dir-my-lib'
-      );
+
+      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
       expect(projectConfiguration).toMatchObject({
         tags: ['one'],
       });
@@ -137,13 +136,13 @@ describe('lib', () => {
       await libraryGenerator(appTree, {
         ...defaultSchema,
         name: 'myLib2',
-        directory: 'myDir',
+        directory: 'myDir2',
         tags: 'one,two',
       });
 
       const lib2ProjectConfiguration = readProjectConfiguration(
         appTree,
-        'my-dir-my-lib2'
+        'my-lib2'
       );
       expect(lib2ProjectConfiguration).toMatchObject({
         tags: ['one', 'two'],
@@ -152,17 +151,14 @@ describe('lib', () => {
 
     it('should update project.json', async () => {
       await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
-      const projectConfiguration = readProjectConfiguration(
-        appTree,
-        'my-dir-my-lib'
-      );
+      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
 
-      expect(projectConfiguration.root).toEqual('libs/my-dir/my-lib');
+      expect(projectConfiguration.root).toEqual('my-dir');
       expect(projectConfiguration.targets.lint).toEqual({
         executor: '@nx/linter:eslint',
         outputs: ['{options.outputFile}'],
         options: {
-          lintFilePatterns: ['libs/my-dir/my-lib/**/*.{ts,tsx,js,jsx}'],
+          lintFilePatterns: ['my-dir/**/*.{ts,tsx,js,jsx}'],
         },
       });
     });
@@ -170,9 +166,9 @@ describe('lib', () => {
     it('should update root tsconfig.base.json', async () => {
       await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
       const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
-      expect(tsconfigJson.compilerOptions.paths['@proj/my-dir/my-lib']).toEqual(
-        ['libs/my-dir/my-lib/src/index.ts']
-      );
+      expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
+        'my-dir/src/index.ts',
+      ]);
       expect(
         tsconfigJson.compilerOptions.paths['my-dir-my-lib/*']
       ).toBeUndefined();
@@ -184,9 +180,9 @@ describe('lib', () => {
       await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
 
       const tsconfigJson = readJson(appTree, '/tsconfig.json');
-      expect(tsconfigJson.compilerOptions.paths['@proj/my-dir/my-lib']).toEqual(
-        ['libs/my-dir/my-lib/src/index.ts']
-      );
+      expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
+        'my-dir/src/index.ts',
+      ]);
       expect(
         tsconfigJson.compilerOptions.paths['my-dir-my-lib/*']
       ).toBeUndefined();
@@ -195,11 +191,8 @@ describe('lib', () => {
     it('should create a local tsconfig.json', async () => {
       await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
 
-      const tsconfigJson = readJson(
-        appTree,
-        'libs/my-dir/my-lib/tsconfig.json'
-      );
-      expect(tsconfigJson.extends).toBe('../../../tsconfig.base.json');
+      const tsconfigJson = readJson(appTree, 'my-dir/tsconfig.json');
+      expect(tsconfigJson.extends).toBe('../tsconfig.base.json');
       expect(tsconfigJson.references).toEqual([
         {
           path: './tsconfig.lib.json',
@@ -215,11 +208,8 @@ describe('lib', () => {
 
       await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
 
-      const tsconfigJson = readJson(
-        appTree,
-        'libs/my-dir/my-lib/tsconfig.json'
-      );
-      expect(tsconfigJson.extends).toBe('../../../tsconfig.json');
+      const tsconfigJson = readJson(appTree, 'my-dir/tsconfig.json');
+      expect(tsconfigJson.extends).toBe('../tsconfig.json');
     });
   });
 
@@ -230,14 +220,14 @@ describe('lib', () => {
         unitTestRunner: 'none',
       });
 
-      expect(appTree.exists('libs/my-lib/tsconfig.spec.json')).toBeFalsy();
-      expect(appTree.exists('libs/my-lib/jest.config.ts')).toBeFalsy();
+      expect(appTree.exists('my-lib/tsconfig.spec.json')).toBeFalsy();
+      expect(appTree.exists('my-lib/jest.config.ts')).toBeFalsy();
       const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
       expect(projectConfiguration.targets.test).toBeUndefined();
       expect(projectConfiguration.targets.lint).toMatchObject({
         executor: '@nx/linter:eslint',
         options: {
-          lintFilePatterns: ['libs/my-lib/**/*.{ts,tsx,js,jsx}'],
+          lintFilePatterns: ['my-lib/**/*.{ts,tsx,js,jsx}'],
         },
         outputs: ['{options.outputFile}'],
       });
@@ -249,12 +239,12 @@ describe('lib', () => {
         unitTestRunner: 'jest',
       });
 
-      expect(appTree.read('libs/my-lib/tsconfig.spec.json', 'utf-8'))
+      expect(appTree.read('my-lib/tsconfig.spec.json', 'utf-8'))
         .toMatchInlineSnapshot(`
         "{
           "extends": "./tsconfig.json",
           "compilerOptions": {
-            "outDir": "../../dist/out-tsc",
+            "outDir": "../dist/out-tsc",
             "module": "commonjs",
             "types": ["jest", "node"]
           },
@@ -273,7 +263,7 @@ describe('lib', () => {
         }
         "
       `);
-      expect(appTree.read('libs/my-lib/jest.config.ts', 'utf-8'))
+      expect(appTree.read('my-lib/jest.config.ts', 'utf-8'))
         .toMatchInlineSnapshot(`
         "module.exports = {
           displayName: 'my-lib',
@@ -284,7 +274,7 @@ describe('lib', () => {
           moduleNameMapper: {
             '\\\\.svg$': '@nx/react-native/plugins/jest/svg-mock',
           },
-          coverageDirectory: '../../coverage/libs/my-lib',
+          coverageDirectory: '../coverage/my-lib',
         };
         "
       `);
@@ -299,7 +289,7 @@ describe('lib', () => {
           },
           "executor": "@nx/jest:jest",
           "options": {
-            "jestConfig": "libs/my-lib/jest.config.ts",
+            "jestConfig": "my-lib/jest.config.ts",
             "passWithNoTests": true,
           },
           "outputs": [
@@ -338,10 +328,10 @@ describe('lib', () => {
         outputs: ['{options.outputPath}'],
         options: {
           external: ['react/jsx-runtime', 'react-native', 'react', 'react-dom'],
-          entryFile: 'libs/my-lib/src/index.ts',
-          outputPath: 'dist/libs/my-lib',
-          project: 'libs/my-lib/package.json',
-          tsConfig: 'libs/my-lib/tsconfig.lib.json',
+          entryFile: 'my-lib/src/index.ts',
+          outputPath: 'dist/my-lib',
+          project: 'my-lib/package.json',
+          tsConfig: 'my-lib/tsconfig.lib.json',
           rollupConfig: '@nx/react/plugins/bundle-rollup',
         },
       });
@@ -370,9 +360,9 @@ describe('lib', () => {
         importPath: '@proj/my-lib',
       });
 
-      const packageJson = readJson(appTree, '/libs/my-lib/package.json');
+      const packageJson = readJson(appTree, 'my-lib/package.json');
       expect(packageJson.name).toEqual('@proj/my-lib');
-      expect(appTree.exists('/libs/my-lib/.babelrc'));
+      expect(appTree.exists('my-lib/.babelrc'));
     });
   });
 
@@ -383,7 +373,7 @@ describe('lib', () => {
         js: true,
       });
 
-      expect(appTree.exists('/libs/my-lib/src/index.js')).toBe(true);
+      expect(appTree.exists('my-lib/src/index.js')).toBe(true);
     });
   });
 
@@ -395,7 +385,7 @@ describe('lib', () => {
         directory: 'myDir',
         importPath: '@myorg/lib',
       });
-      const packageJson = readJson(appTree, 'libs/my-dir/my-lib/package.json');
+      const packageJson = readJson(appTree, 'my-dir/package.json');
       const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
 
       expect(packageJson.name).toBe('@myorg/lib');
@@ -435,7 +425,7 @@ describe('lib', () => {
         ...defaultSchema,
         strict: false,
       });
-      const tsconfigJson = readJson(appTree, '/libs/my-lib/tsconfig.json');
+      const tsconfigJson = readJson(appTree, 'my-lib/tsconfig.json');
 
       expect(
         tsconfigJson.compilerOptions.forceConsistentCasingInFileNames

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

@@ -21,14 +21,10 @@ describe('react:stories for applications', () => {
       project: 'test-ui-app',
     });
 
-    expect(appTree.exists('apps/test-ui-app/src/app/App.tsx')).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.tsx')).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.stories.tsx')).toBeTruthy();
     expect(
-      appTree.exists('apps/test-ui-app/src/app/App.stories.tsx')
-    ).toBeTruthy();
-    expect(
-      appTree.exists(
-        'apps/test-ui-app/src/app/another-cmp/another-cmp.stories.tsx'
-      )
+      appTree.exists('test-ui-app/src/app/another-cmp/another-cmp.stories.tsx')
     ).toBeTruthy();
   });
 
@@ -39,17 +35,13 @@ describe('react:stories for applications', () => {
     });
     await storiesGenerator(appTree, {
       project: 'test-ui-app',
-      ignorePaths: ['apps/test-ui-app/src/app/**'],
+      ignorePaths: ['test-ui-app/src/app/**'],
     });
 
-    expect(appTree.exists('apps/test-ui-app/src/app/App.tsx')).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.tsx')).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.stories.tsx')).toBeFalsy();
     expect(
-      appTree.exists('apps/test-ui-app/src/app/App.stories.tsx')
-    ).toBeFalsy();
-    expect(
-      appTree.exists(
-        'apps/test-ui-app/src/app/another-cmp/another-cmp.stories.tsx'
-      )
+      appTree.exists('test-ui-app/src/app/another-cmp/another-cmp.stories.tsx')
     ).toBeFalsy();
   });
 
@@ -61,18 +53,14 @@ describe('react:stories for applications', () => {
 
     await storiesGenerator(appTree, {
       project: 'test-ui-app',
-      ignorePaths: [
-        'apps/test-ui-app/src/app/another-new-cmp/another-new-cmp.tsx',
-      ],
+      ignorePaths: ['test-ui-app/src/app/another-new-cmp/another-new-cmp.tsx'],
     });
 
-    expect(appTree.exists('apps/test-ui-app/src/app/App.tsx')).toBeTruthy();
-    expect(
-      appTree.exists('apps/test-ui-app/src/app/App.stories.tsx')
-    ).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.tsx')).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.stories.tsx')).toBeTruthy();
     expect(
       appTree.exists(
-        'apps/test-ui-app/src/app/another-new-cmp/another-new-cmp.stories.tsx'
+        'test-ui-app/src/app/another-new-cmp/another-new-cmp.stories.tsx'
       )
     ).toBeFalsy();
   });
@@ -89,23 +77,19 @@ describe('react:stories for applications', () => {
     });
     await storiesGenerator(appTree, {
       project: 'test-ui-app',
-      ignorePaths: [
-        'apps/test-ui-app/src/app/another-new-cmp/another-new-cmp.tsx',
-      ],
+      ignorePaths: ['test-ui-app/src/app/another-new-cmp/another-new-cmp.tsx'],
     });
 
-    expect(appTree.exists('apps/test-ui-app/src/app/App.tsx')).toBeTruthy();
-    expect(
-      appTree.exists('apps/test-ui-app/src/app/App.stories.tsx')
-    ).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.tsx')).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.stories.tsx')).toBeTruthy();
     expect(
       appTree.exists(
-        'apps/test-ui-app/src/app/another-new-cmp/comp-a/comp-a.stories.tsx'
+        'test-ui-app/src/app/another-new-cmp/comp-a/comp-a.stories.tsx'
       )
     ).toBeTruthy();
     expect(
       appTree.exists(
-        'apps/test-ui-app/src/app/another-new-cmp/another-new-cmp.stories.tsx'
+        'test-ui-app/src/app/another-new-cmp/another-new-cmp.stories.tsx'
       )
     ).toBeFalsy();
   });
@@ -113,7 +97,7 @@ describe('react:stories for applications', () => {
   it('should ignore files that do not contain components', async () => {
     // create another component
     appTree.write(
-      'apps/test-ui-app/src/app/some-utils.js',
+      'test-ui-app/src/app/some-utils.js',
       `export const add = (a: number, b: number) => a + b;`
     );
 
@@ -123,14 +107,12 @@ describe('react:stories for applications', () => {
 
     // should just create the story and not error, even though there's a js file
     // not containing any react component
-    expect(
-      appTree.exists('apps/test-ui-app/src/app/App.stories.tsx')
-    ).toBeTruthy();
+    expect(appTree.exists('test-ui-app/src/app/App.stories.tsx')).toBeTruthy();
   });
 });
 
 export async function createTestUIApp(libName: string): Promise<Tree> {
-  let appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
+  let appTree = createTreeWithEmptyWorkspace();
   appTree.write('.gitignore', '');
 
   await applicationGenerator(appTree, {
@@ -140,6 +122,7 @@ export async function createTestUIApp(libName: string): Promise<Tree> {
     unitTestRunner: 'none',
     name: libName,
     install: false,
+    projectNameAndRootFormat: 'as-provided',
   });
   return appTree;
 }