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

package/generators.json

@@ -62,14 +62,14 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application#reactNativeApplicationGenerator",
+      "factory": "./src/generators/application/application#reactNativeApplicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
       "description": "Create a React Native application."
     },
     "library": {
-      "factory": "./src/generators/library/library#reactNativeLibraryGenerator",
+      "factory": "./src/generators/library/library#reactNativeLibraryGeneratorInternal",
       "schema": "./src/generators/library/schema.json",
       "aliases": ["lib"],
       "x-type": "library",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "16.8.0-beta.1",
+  "version": "16.8.0-beta.3",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -25,14 +25,14 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nrwl/react-native": "16.8.0-beta.1",
-    "@nx/detox": "16.8.0-beta.1",
-    "@nx/devkit": "16.8.0-beta.1",
-    "@nx/jest": "16.8.0-beta.1",
-    "@nx/js": "16.8.0-beta.1",
-    "@nx/linter": "16.8.0-beta.1",
-    "@nx/react": "16.8.0-beta.1",
-    "@nx/workspace": "16.8.0-beta.1",
+    "@nrwl/react-native": "16.8.0-beta.3",
+    "@nx/detox": "16.8.0-beta.3",
+    "@nx/devkit": "16.8.0-beta.3",
+    "@nx/jest": "16.8.0-beta.3",
+    "@nx/js": "16.8.0-beta.3",
+    "@nx/linter": "16.8.0-beta.3",
+    "@nx/react": "16.8.0-beta.3",
+    "@nx/workspace": "16.8.0-beta.3",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
@@ -58,5 +58,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "231a998e004c13e559c171ba6c164a9127886153"
+  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
 }

package/src/generators/application/application.d.ts

@@ -1,5 +1,6 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function reactNativeApplicationGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function reactNativeApplicationGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default reactNativeApplicationGenerator;
 export declare const reactNativeApplicationSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/application/application.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reactNativeApplicationSchematic = exports.reactNativeApplicationGenerator = void 0;
+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");
@@ -14,7 +14,13 @@ 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* () {
-        const options = (0, normalize_options_1.normalizeOptions)(host, schema);
+        return yield reactNativeApplicationGeneratorInternal(host, Object.assign({ 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 }));
@@ -31,6 +37,6 @@ function reactNativeApplicationGenerator(host, schema) {
         return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask, chmodTaskGradlew);
     });
 }
-exports.reactNativeApplicationGenerator = reactNativeApplicationGenerator;
+exports.reactNativeApplicationGeneratorInternal = reactNativeApplicationGeneratorInternal;
 exports.default = reactNativeApplicationGenerator;
 exports.reactNativeApplicationSchematic = (0, devkit_1.convertNxGenerator)(reactNativeApplicationGenerator);

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

@@ -9,7 +9,7 @@ function addDetox(host, options) {
         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.name}-e2e`, e2eDirectory: options.directory, appProject: options.projectName, appDisplayName: options.displayName, appName: options.name, framework: 'react-native', skipFormat: true }));
+        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 }));
     });
 }
 exports.addDetox = addDetox;

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

@@ -25,7 +25,7 @@ function getTargets(options) {
     architect.serve = {
         executor: 'nx:run-commands',
         options: {
-            command: `nx start ${options.name}`,
+            command: `nx start ${options.projectName}`,
         },
     };
     architect['run-ios'] = {

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

@@ -11,14 +11,14 @@ describe('Normalize Options', () => {
     appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
 
-  it('should normalize options with name in kebab case', () => {
+  it('should normalize options with name in kebab case', async () => {
     const schema: Schema = {
       name: 'my-app',
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
       install: false,
     };
-    const options = normalizeOptions(appTree, schema);
+    const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
       androidProjectRoot: 'apps/my-app/android',
       appProjectRoot: 'apps/my-app',
@@ -29,6 +29,7 @@ describe('Normalize Options', () => {
       name: 'my-app',
       parsedTags: [],
       projectName: 'my-app',
+      projectNameAndRootFormat: 'derived',
       linter: Linter.EsLint,
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
@@ -37,13 +38,13 @@ describe('Normalize Options', () => {
     });
   });
 
-  it('should normalize options with name in camel case', () => {
+  it('should normalize options with name in camel case', async () => {
     const schema: Schema = {
       name: 'myApp',
       e2eTestRunner: 'none',
       install: false,
     };
-    const options = normalizeOptions(appTree, schema);
+    const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
       androidProjectRoot: 'apps/my-app/android',
       appProjectRoot: 'apps/my-app',
@@ -54,6 +55,7 @@ describe('Normalize Options', () => {
       name: 'my-app',
       parsedTags: [],
       projectName: 'my-app',
+      projectNameAndRootFormat: 'derived',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
       unitTestRunner: 'jest',
@@ -61,14 +63,14 @@ describe('Normalize Options', () => {
     });
   });
 
-  it('should normalize options with directory', () => {
+  it('should normalize options with directory', async () => {
     const schema: Schema = {
       name: 'my-app',
       directory: 'directory',
       e2eTestRunner: 'none',
       install: false,
     };
-    const options = normalizeOptions(appTree, schema);
+    const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
       androidProjectRoot: 'apps/directory/my-app/android',
       appProjectRoot: 'apps/directory/my-app',
@@ -80,6 +82,7 @@ describe('Normalize Options', () => {
       directory: 'directory',
       parsedTags: [],
       projectName: 'directory-my-app',
+      projectNameAndRootFormat: 'derived',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
       unitTestRunner: 'jest',
@@ -87,13 +90,13 @@ describe('Normalize Options', () => {
     });
   });
 
-  it('should normalize options that has directory in its name', () => {
+  it('should normalize options that has directory in its name', async () => {
     const schema: Schema = {
       name: 'directory/my-app',
       e2eTestRunner: 'none',
       install: false,
     };
-    const options = normalizeOptions(appTree, schema);
+    const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
       androidProjectRoot: 'apps/directory/my-app/android',
       appProjectRoot: 'apps/directory/my-app',
@@ -104,6 +107,7 @@ describe('Normalize Options', () => {
       name: 'directory/my-app',
       parsedTags: [],
       projectName: 'directory-my-app',
+      projectNameAndRootFormat: 'derived',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
       unitTestRunner: 'jest',
@@ -111,14 +115,14 @@ describe('Normalize Options', () => {
     });
   });
 
-  it('should normalize options with display name', () => {
+  it('should normalize options with display name', async () => {
     const schema: Schema = {
       name: 'my-app',
       displayName: 'My App',
       e2eTestRunner: 'none',
       install: false,
     };
-    const options = normalizeOptions(appTree, schema);
+    const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
       androidProjectRoot: 'apps/my-app/android',
       appProjectRoot: 'apps/my-app',
@@ -129,6 +133,7 @@ describe('Normalize Options', () => {
       name: 'my-app',
       parsedTags: [],
       projectName: 'my-app',
+      projectNameAndRootFormat: 'derived',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',
       unitTestRunner: 'jest',

package/src/generators/application/lib/normalize-options.d.ts

@@ -10,4 +10,4 @@ export interface NormalizedSchema extends Schema {
     parsedTags: string[];
     entryFile: string;
 }
-export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

package/src/generators/application/lib/normalize-options.js

@@ -1,34 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function normalizeOptions(host, options) {
-    const { fileName, className } = (0, devkit_1.names)(options.name);
-    const { appsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-    const directoryName = options.directory
-        ? (0, devkit_1.names)(options.directory).fileName
-        : '';
-    const projectDirectory = directoryName
-        ? `${directoryName}/${fileName}`
-        : fileName;
-    const appProjectName = projectDirectory.replace(/\//g, '-');
-    const appProjectRoot = (0, devkit_1.joinPathFragments)(appsDir, projectDirectory);
-    const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
-    const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const entryFile = options.js ? 'src/main.js' : 'src/main.tsx';
-    /**
-     * if options.name is "my-app"
-     * name: "my-app", className: 'MyApp', lowerCaseName: 'myapp', displayName: 'MyApp', projectName: 'my-app', appProjectRoot: 'apps/my-app', androidProjectRoot: 'apps/my-app/android', iosProjectRoot: 'apps/my-app/ios'
-     * if options.name is "myApp"
-     * name: "my-app", className: 'MyApp', lowerCaseName: 'myapp', displayName: 'MyApp', projectName: 'my-app', appProjectRoot: 'apps/my-app', androidProjectRoot: 'apps/my-app/android', iosProjectRoot: 'apps/my-app/ios'
-     */
-    return Object.assign(Object.assign({}, options), { unitTestRunner: options.unitTestRunner || 'jest', e2eTestRunner: options.e2eTestRunner || 'detox', name: fileName, className, lowerCaseName: className.toLowerCase(), displayName: options.displayName || className, projectName: appProjectName, appProjectRoot,
-        iosProjectRoot,
-        androidProjectRoot,
-        parsedTags,
-        entryFile });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName: appProjectName, names: projectNames, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            callingGenerator: '@nx/react-native:application',
+        });
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        const { className } = (0, devkit_1.names)(options.name);
+        const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
+        const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        const entryFile = options.js ? 'src/main.js' : 'src/main.tsx';
+        return Object.assign(Object.assign({}, options), { unitTestRunner: options.unitTestRunner || 'jest', e2eTestRunner: options.e2eTestRunner || 'detox', name: projectNames.projectSimpleName, className, lowerCaseName: className.toLowerCase(), displayName: options.displayName || className, projectName: appProjectName, appProjectRoot,
+            iosProjectRoot,
+            androidProjectRoot,
+            parsedTags,
+            entryFile });
+    });
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/application/schema.d.ts

@@ -1,4 +1,5 @@
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
 
 export interface Schema {
   name: string;
@@ -6,6 +7,7 @@ export interface Schema {
   style?: string;
   skipFormat?: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner?: 'jest' | 'none';
   pascalCaseFiles?: boolean;

package/src/generators/application/schema.json

@@ -23,7 +23,8 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the application?"
+      "x-prompt": "What name would you like to use for the application?",
+      "pattern": "^[a-zA-Z][^:]*$"
     },
     "displayName": {
       "description": "The display name to show in the application. Defaults to name.",
@@ -33,6 +34,11 @@
       "description": "The directory of the new application.",
       "type": "string"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "skipFormat": {
       "description": "Skip formatting files",
       "type": "boolean",

package/src/generators/component/component.js

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_import_1 = require("./lib/add-import");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const path_1 = require("path");
 function reactNativeComponentGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
@@ -17,7 +18,7 @@ function reactNativeComponentGenerator(host, schema) {
 exports.reactNativeComponentGenerator = reactNativeComponentGenerator;
 function createComponentFiles(host, options) {
     const componentDir = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.directory);
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files'), componentDir, Object.assign(Object.assign({}, options), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), componentDir, Object.assign(Object.assign({}, options), { tmpl: '' }));
     for (const c of host.listChanges()) {
         let deleteFile = false;
         if (options.skipTests && /.*spec.tsx/.test(c.path)) {

package/src/generators/library/lib/normalize-options.d.ts

@@ -5,9 +5,8 @@ export interface NormalizedSchema extends Schema {
     fileName: string;
     projectRoot: string;
     routePath: string;
-    projectDirectory: string;
     parsedTags: string[];
     appMain?: string;
     appSourceRoot?: string;
 }
-export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

package/src/generators/library/lib/normalize-options.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const devkit_1 = require("@nx/devkit");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+const tslib_1 = require("tslib");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 function normalizeOptions(host, options) {
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const projectDirectory = options.directory
-        ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
-        : name;
-    const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
-    const fileName = projectName;
-    const { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
-    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const importPath = options.importPath || (0, get_import_path_1.getImportPath)(host, projectDirectory);
-    const normalized = Object.assign(Object.assign({}, options), { fileName, routePath: `/${name}`, name: projectName, projectRoot,
-        projectDirectory,
-        parsedTags,
-        importPath });
-    return normalized;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName, names: projectNames, projectRoot, importPath, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'library',
+            directory: options.directory,
+            importPath: options.importPath,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            callingGenerator: '@nx/react-native:library',
+        });
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        const normalized = Object.assign(Object.assign({}, options), { fileName: projectName, routePath: `/${projectNames.projectSimpleName}`, name: projectName, projectRoot,
+            parsedTags,
+            importPath });
+        return normalized;
+    });
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/library/library.d.ts

@@ -1,5 +1,6 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function reactNativeLibraryGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function reactNativeLibraryGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default reactNativeLibraryGenerator;
 export declare const reactNativeLibrarySchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/library/library.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reactNativeLibrarySchematic = exports.reactNativeLibraryGenerator = void 0;
+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");
@@ -11,7 +11,13 @@ 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* () {
-        const options = (0, normalize_options_1.normalizeOptions)(host, schema);
+        return yield reactNativeLibraryGeneratorInternal(host, Object.assign({ 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)`);
         }
@@ -43,14 +49,13 @@ function reactNativeLibraryGenerator(host, schema) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.reactNativeLibraryGenerator = reactNativeLibraryGenerator;
+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 { libsDir } = (0, devkit_1.getWorkspaceLayout)(host);
             const external = [
                 'react/jsx-runtime',
                 'react-native',
@@ -61,7 +66,7 @@ function addProject(host, options) {
                 executor: '@nx/rollup:rollup',
                 outputs: ['{options.outputPath}'],
                 options: {
-                    outputPath: `dist/${libsDir}/${options.projectDirectory}`,
+                    outputPath: `dist/${options.projectRoot}`,
                     tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
                     project: `${options.projectRoot}/package.json`,
                     entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),

package/src/generators/library/schema.d.ts

@@ -1,4 +1,5 @@
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
 
 /**
  * Same as the @nx/react library schema, except it removes keys: style, component, routing, appProject
@@ -6,6 +7,7 @@ import { Linter } from '@nx/linter';
 export interface Schema {
   name: string;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   skipTsConfig: boolean;
   skipFormat: boolean;
   tags?: string;

package/src/generators/library/schema.json

@@ -20,7 +20,7 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the library?",
-      "pattern": "^[a-zA-Z].*$"
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
     },
     "directory": {
       "type": "string",
@@ -28,6 +28,11 @@
       "alias": "dir",
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",

package/src/utils/add-linting.js

@@ -5,6 +5,7 @@ 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) {
@@ -20,16 +21,14 @@ function addLinting(host, options) {
             skipPackageJson: options.skipPackageJson,
         });
         tasks.push(lintTask);
-        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, '.eslintrc.json'), (json) => {
-            json = (0, lint_1.extendReactEslintJson)(json);
-            json.ignorePatterns = [
-                ...json.ignorePatterns,
+        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',
-            ];
-            return json;
-        });
+            ]);
+        }
         if (!options.skipPackageJson) {
             const installTask = yield (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
             tasks.push(installTask);